From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Mon, 25 Oct 2010 05:32:53 +0000 (+0900)
Subject: Merge branch 'master' of git://git.postgresql.org/git/postgresql into fdw_select_simple
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=894d13fb39f41ee968baa834d142379ee3a25a18;p=users%2Fhanada%2Fpostgres.git

Merge branch 'master' of git://git.postgresql.org/git/postgresql into fdw_select_simple
---

894d13fb39f41ee968baa834d142379ee3a25a18
diff --cc src/backend/parser/gram.y
index c9e8a0553f,1394b21dec..8529fb193d
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@@ -182,10 -182,9 +182,10 @@@ static RangeVar *makeRangeVarFromAnyNam
  }
  
  %type <node>	stmt schema_stmt
- 		AlterDatabaseStmt AlterDatabaseSetStmt AlterDomainStmt AlterFdwStmt
- 		AlterForeignServerStmt AlterGroupStmt
+ 		AlterDatabaseStmt AlterDatabaseSetStmt AlterDomainStmt AlterEnumStmt
+ 		AlterFdwStmt AlterForeignServerStmt AlterGroupStmt
  		AlterObjectSchemaStmt AlterOwnerStmt AlterSeqStmt AlterTableStmt
 +		AlterForeignTableStmt
  		AlterCompositeTypeStmt AlterUserStmt AlterUserMappingStmt AlterUserSetStmt
  		AlterRoleStmt AlterRoleSetStmt
  		AlterDefaultPrivilegesStmt DefACLAction
@@@ -667,9 -652,9 +667,10 @@@ stmt 
  			| AlterDatabaseSetStmt
  			| AlterDefaultPrivilegesStmt
  			| AlterDomainStmt
+ 			| AlterEnumStmt
  			| AlterFdwStmt
  			| AlterForeignServerStmt
 +			| AlterForeignTableStmt
  			| AlterFunctionStmt
  			| AlterGroupStmt
  			| AlterObjectSchemaStmt