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

diff --cc doc/src/sgml/catalogs.sgml
Simple merge

diff --cc src/backend/nodes/copyfuncs.c
Simple merge

diff --cc src/backend/nodes/equalfuncs.c
Simple merge

diff --cc src/backend/parser/gram.y
index c9e8a0553f9bb941576542f90c47b00f71eb16f4,1394b21dec4de7400a466269ba6b36bb6390ce4e..8529fb193ded1b4bfd65f51edc51f65e7dfd605d
--- 1/src/backend/parser/gram.y
--- 2/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

diff --cc src/backend/tcop/utility.c
Simple merge

diff --cc src/bin/pg_dump/pg_dump.c
Simple merge

diff --cc src/bin/psql/describe.c
Simple merge

diff --cc src/include/catalog/indexing.h
Simple merge

diff --cc src/include/nodes/nodes.h
Simple merge

diff --cc src/include/nodes/parsenodes.h
Simple merge