Merge tag 'REL9_4_6' into bdr-pg/REL9_4_STABLE

Conflicts:
	src/backend/commands/tablecmds.c
	src/backend/replication/walsender.c

diff --cc contrib/pg_upgrade/pg_upgrade.c
Simple merge

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

diff --cc src/backend/commands/tablecmds.c
index e4b59cc61dac7a453dcc4d5f6b4b0a2643c4f0dc,5a06fdbb754e1219cc2bcf561a34b885876ee524..ce87219ab1e7d5896935a3cf07a98bf92d78713d
--- 1/src/backend/commands/tablecmds.c
--- 2/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -3435,20 -3390,17 +3436,20 @@@ ATExecCmd(List **wqueue, AlteredTableIn
            break;
        case AT_ReAddConstraint:        /* Re-add pre-existing check
                                         * constraint */
 -          ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
 -                              true, true, lockmode);
 +          newoid =
 +              ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
-                                   false, true, lockmode);
++                                  true, true, lockmode);
            break;
        case AT_AddIndexConstraint:     /* ADD CONSTRAINT USING INDEX */
 -          ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def, lockmode);
 +          newoid = ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def,
 +                                            lockmode);
            break;
        case AT_AlterConstraint:        /* ALTER CONSTRAINT */
 -          ATExecAlterConstraint(rel, cmd, false, false, lockmode);
 +          newoid = ATExecAlterConstraint(rel, cmd, false, false, lockmode);
            break;
        case AT_ValidateConstraint:     /* VALIDATE CONSTRAINT */
 -          ATExecValidateConstraint(rel, cmd->name, false, false, lockmode);
 +          newoid = ATExecValidateConstraint(rel, cmd->name, false, false,
 +                                            lockmode);
            break;
        case AT_ValidateConstraintRecurse:      /* VALIDATE CONSTRAINT with
                                                 * recursion */
@@@ -5862,15 -5765,8 +5863,8 @@@ ATExecAddConstraint(List **wqueue, Alte
   * AddRelationNewConstraints would normally assign different names to the
   * child constraints.  To fix that, we must capture the name assigned at
   * the parent table and pass that down.
-  *
-  * When re-adding a previously existing constraint (during ALTER COLUMN TYPE),
-  * we don't need to recurse here, because recursion will be carried out at a
-  * higher level; the constraint name issue doesn't apply because the names
-  * have already been assigned and are just being re-used.  We need a separate
-  * "is_readd" flag for that; just setting recurse=false would result in an
-  * error if there are child tables.
   */
 -static void
 +static Oid
  ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
                     Constraint *constr, bool recurse, bool recursing,
                     bool is_readd, LOCKMODE lockmode)
@@@ -5948,11 -5836,9 +5942,9 @@@
  
    /*
     * If adding a NO INHERIT constraint, no need to find our children.
-    * Likewise, in a re-add operation, we don't need to recurse (that will be
-    * handled at higher levels).
     */
-   if (constr->is_no_inherit || is_readd)
+   if (constr->is_no_inherit)
 -      return;
 +      return constrOid;
  
    /*
     * Propagate to children as appropriate.  Unlike most other ALTER

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

diff --cc src/backend/postmaster/bgworker.c
Simple merge

diff --cc src/backend/replication/logical/logicalfuncs.c
index c3be6174e44f74beadc83a4f1f8ccf179f7cbca8,f61608e8a313301980a3ea7414c8606c691a4d4a..1675dd99be33b7b8532ff11b2c741ea2d2f3bb34
--- 1/src/backend/replication/logical/logicalfuncs.c
--- 2/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@@ -514,29 -511,5 +514,27 @@@ pg_logical_slot_get_binary_changes(PG_F
  Datum
  pg_logical_slot_peek_binary_changes(PG_FUNCTION_ARGS)
  {
-   Datum       ret = pg_logical_slot_get_changes_guts(fcinfo, false, true);
- 
-   return ret;
+   return pg_logical_slot_get_changes_guts(fcinfo, false, true);
  }
 +
 +
 +/*
 + * SQL function returning the changestream in binary, only peeking ahead.
 + */
 +Datum
 +pg_logical_send_message_bytea(PG_FUNCTION_ARGS)
 +{
 +  bool transactional = PG_GETARG_BOOL(0);
 +  bytea *data = PG_GETARG_BYTEA_PP(1);
 +  XLogRecPtr lsn;
 +
 +  lsn = LogStandbyMessage(VARDATA_ANY(data), VARSIZE_ANY_EXHDR(data), transactional);
 +  PG_RETURN_LSN(lsn);
 +}
 +
 +Datum
 +pg_logical_send_message_text(PG_FUNCTION_ARGS)
 +{
 +  /* bytea and text are compatible */
 +  return pg_logical_send_message_bytea(fcinfo);
 +}

diff --cc src/backend/replication/walsender.c
index 8bb993bb2ad2119ce38f10e4b199319877e2cf80,a39f373fa1513b38d930d329ea46614886079c4b..1d0d20b01be672d3a31cd09437222c731beb494f
--- 1/src/backend/replication/walsender.c
--- 2/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@@ -298,7 -298,7 +298,8 @@@ IdentifySystem(void
    char        xpos[MAXFNAMELEN];
    XLogRecPtr  logptr;
    char       *dbname = NULL;
 +  char        dboid[10];
+   Size        len;
  
    /*
     * Reply with a result set with one row, four columns. First col is system
@@@ -390,26 -379,33 +391,38 @@@
  
    /* Send a DataRow message */
    pq_beginmessage(&buf, 'D');
 -  pq_sendint(&buf, 4, 2);     /* # of columns */
 +  pq_sendint(&buf, 5, 2);     /* # of columns */
-   pq_sendint(&buf, strlen(sysid), 4); /* col1 len */
-   pq_sendbytes(&buf, (char *) &sysid, strlen(sysid));
-   pq_sendint(&buf, strlen(tli), 4);   /* col2 len */
-   pq_sendbytes(&buf, (char *) tli, strlen(tli));
-   pq_sendint(&buf, strlen(xpos), 4);  /* col3 len */
-   pq_sendbytes(&buf, (char *) xpos, strlen(xpos));
-   /* send NULL if not connected to a database */
+ 
+   /* column 1: system identifier */
+   len = strlen(sysid);
+   pq_sendint(&buf, len, 4);
+   pq_sendbytes(&buf, (char *) &sysid, len);
+ 
+   /* column 2: timeline */
+   len = strlen(tli);
+   pq_sendint(&buf, len, 4);
+   pq_sendbytes(&buf, (char *) tli, len);
+ 
+   /* column 3: xlog position */
+   len = strlen(xpos);
+   pq_sendint(&buf, len, 4);
+   pq_sendbytes(&buf, (char *) xpos, len);
+ 
 -  /* column 4: database name, or NULL if none */
++  /* column 4 & 5: database name and oid, or NULL if none */
    if (dbname)
    {
-       pq_sendint(&buf, strlen(dbname), 4);    /* col4 len */
-       pq_sendbytes(&buf, (char *) dbname, strlen(dbname));
+       len = strlen(dbname);
+       pq_sendint(&buf, len, 4);
+       pq_sendbytes(&buf, (char *) dbname, len);
 +
-       pq_sendint(&buf, strlen(dboid), 4);     /* col5 len */
-       pq_sendbytes(&buf, dboid, strlen(dboid));
++      len = strlen(dboid);
++      pq_sendint(&buf, len, 4);
++      pq_sendbytes(&buf, dboid, len);
    }
    else
    {
-       pq_sendint(&buf, -1, 4);    /* col4 len, NULL */
-       pq_sendint(&buf, -1, 4);    /* col5 len, NULL */
+       pq_sendint(&buf, -1, 4);
++      pq_sendint(&buf, -1, 4);
    }
  
    pq_endmessage(&buf);

diff --cc src/backend/utils/adt/ruleutils.c
index 6d213c4105baf20500f76dcfa5e4ce3fc147fb05,2f8d42f98270e0a3e0a67910bb0a6c975e00d180..870fbd35daef63ff71d2a0bbac455a6cc4b91a49
--- 1/src/backend/utils/adt/ruleutils.c
--- 2/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@@ -53,9 -54,9 +54,10 @@@
  #include "utils/array.h"
  #include "utils/builtins.h"
  #include "utils/fmgroids.h"
+ #include "utils/hsearch.h"
  #include "utils/lsyscache.h"
  #include "utils/rel.h"
 +#include "utils/ruleutils.h"
  #include "utils/snapmgr.h"
  #include "utils/syscache.h"
  #include "utils/tqual.h"
@@@ -1617,11 -1299,13 +1629,13 @@@ pg_get_constraintdef_ext(PG_FUNCTION_AR
                                                              prettyFlags)));
  }
  
- /* Internal version that returns a palloc'd C string; no pretty-printing */
+ /*
+  * Internal version that returns a full ALTER TABLE ... ADD CONSTRAINT command
+  */
  char *
 -pg_get_constraintdef_string(Oid constraintId)
 +pg_get_constraintdef_string(Oid constraintId, bool fullCommand)
  {
 -  return pg_get_constraintdef_worker(constraintId, true, 0);
 +  return pg_get_constraintdef_worker(constraintId, fullCommand, 0);
  }
  
  /*

diff --cc src/backend/utils/misc/guc.c
Simple merge

diff --cc src/bin/initdb/initdb.c
index a6677b8757d10147871b6c19422fb798638c94d6,034d54cabb4401fbbcabd0297114a7dd6c7a73c2..aa7ed74bc059f55484cc4c4762631c6a319ab7f1
--- 1/src/bin/initdb/initdb.c
--- 2/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@@ -191,10 -191,8 +191,9 @@@ char     *restrict_env
  #endif
  static const char *subdirs[] = {
    "global",
-   "pg_xlog",
    "pg_xlog/archive_status",
    "pg_clog",
 +  "pg_committs",
    "pg_dynshmem",
    "pg_notify",
    "pg_serial",

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/pg_proc.h
Simple merge

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