Merge branch 'master' into fdw_core

Conflicts:
	src/backend/commands/tablecmds.c

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

diff --cc doc/src/sgml/ref/comment.sgml
Simple merge

diff --cc doc/src/sgml/ref/create_sequence.sgml
Simple merge

diff --cc doc/src/sgml/ref/lock.sgml
Simple merge

diff --cc src/backend/catalog/information_schema.sql
Simple merge

diff --cc src/backend/catalog/objectaddress.c
Simple merge

diff --cc src/backend/commands/alter.c
Simple merge

diff --cc src/backend/commands/comment.c
Simple merge

diff --cc src/backend/commands/explain.c
Simple merge

diff --cc src/backend/commands/tablecmds.c
index fb0f45b582f69547da03dbc066c826946633c84d,e8808e28c68ce397d0e87ce73122d94efe924570..824e004cb8528fee8a29bd250e1928aa3c27155e
--- 1/src/backend/commands/tablecmds.c
--- 2/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -2671,16 -2679,16 +2703,16 @@@ ATPrepCmd(List **wqueue, Relation rel, 
    switch (cmd->subtype)
    {
        case AT_AddColumn:      /* ADD COLUMN */
 -          ATSimplePermissions(rel, false, true);
 +          ATSimplePermissions(rel, false, true, true);
            /* Performs own recursion */
-           ATPrepAddColumn(wqueue, rel, recurse, cmd, lockmode);
+           ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
            pass = AT_PASS_ADD_COL;
            break;
        case AT_AddColumnToView:        /* add column via CREATE OR REPLACE
                                         * VIEW */
 -          ATSimplePermissions(rel, true, false);
 +          ATSimplePermissions(rel, true, false, false);
            /* Performs own recursion */
-           ATPrepAddColumn(wqueue, rel, recurse, cmd, lockmode);
+           ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
            pass = AT_PASS_ADD_COL;
            break;
        case AT_ColumnDefault:  /* ALTER COLUMN DEFAULT */
@@@ -2727,8 -2735,8 +2759,8 @@@
            pass = AT_PASS_MISC;
            break;
        case AT_DropColumn:     /* DROP COLUMN */
 -          ATSimplePermissions(rel, false, true);
 +          ATSimplePermissions(rel, false, true, true);
-           ATPrepDropColumn(rel, recurse, cmd);
+           ATPrepDropColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
            /* Recursion occurs during execution phase */
            pass = AT_PASS_DROP;
            break;

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

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

diff --cc src/backend/optimizer/util/plancat.c
Simple merge

diff --cc src/backend/parser/gram.y
Simple merge

diff --cc src/backend/utils/cache/syscache.c
Simple merge

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

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

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

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

diff --cc src/include/utils/builtins.h
Simple merge

diff --cc src/test/regress/expected/alter_table.out
Simple merge

diff --cc src/test/regress/expected/type_sanity.out
Simple merge

diff --cc src/test/regress/sql/type_sanity.sql
Simple merge