Merge commit 'b5bce6c1ec6061c8a4f730d927e162db7e2ce365'
authorPavan Deolasee <[email protected]>
Thu, 27 Oct 2016 15:02:55 +0000 (20:32 +0530)
committerPavan Deolasee <[email protected]>
Thu, 27 Oct 2016 15:02:55 +0000 (20:32 +0530)
484 files changed:
1  2 
.gitignore
configure
configure.in
contrib/Makefile
contrib/citext/Makefile
contrib/citext/expected/citext_1.out
contrib/citext/sql/citext.sql
contrib/hstore/expected/hstore.out
contrib/hstore/hstore_io.c
contrib/hstore/sql/hstore.sql
contrib/ltree/Makefile
contrib/pg_stat_statements/pg_stat_statements.c
contrib/pg_trgm/expected/pg_trgm.out
contrib/sepgsql/hooks.c
doc/bug.template
doc/src/sgml/auto-explain.sgml
doc/src/sgml/backup.sgml
doc/src/sgml/btree-gist.sgml
doc/src/sgml/catalogs.sgml
doc/src/sgml/config.sgml
doc/src/sgml/contrib.sgml
doc/src/sgml/datatype.sgml
doc/src/sgml/dblink.sgml
doc/src/sgml/ddl.sgml
doc/src/sgml/filelist.sgml
doc/src/sgml/func.sgml
doc/src/sgml/high-availability.sgml
doc/src/sgml/indices.sgml
doc/src/sgml/installation.sgml
doc/src/sgml/keywords.sgml
doc/src/sgml/legal.sgml
doc/src/sgml/libpq.sgml
doc/src/sgml/lobj.sgml
doc/src/sgml/ltree.sgml
doc/src/sgml/maintenance.sgml
doc/src/sgml/manage-ag.sgml
doc/src/sgml/mvcc.sgml
doc/src/sgml/pageinspect.sgml
doc/src/sgml/pgbuffercache.sgml
doc/src/sgml/pgstatstatements.sgml
doc/src/sgml/pgstattuple.sgml
doc/src/sgml/plpgsql.sgml
doc/src/sgml/pltcl.sgml
doc/src/sgml/postgres.sgml
doc/src/sgml/recovery-config.sgml
doc/src/sgml/ref/allfiles.sgml
doc/src/sgml/ref/alter_database.sgml
doc/src/sgml/ref/alter_large_object.sgml
doc/src/sgml/ref/alter_table.sgml
doc/src/sgml/ref/alter_trigger.sgml
doc/src/sgml/ref/alter_user_mapping.sgml
doc/src/sgml/ref/copy.sgml
doc/src/sgml/ref/create_aggregate.sgml
doc/src/sgml/ref/create_database.sgml
doc/src/sgml/ref/create_function.sgml
doc/src/sgml/ref/create_index.sgml
doc/src/sgml/ref/create_table.sgml
doc/src/sgml/ref/create_tablespace.sgml
doc/src/sgml/ref/create_user_mapping.sgml
doc/src/sgml/ref/create_view.sgml
doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
doc/src/sgml/ref/drop_server.sgml
doc/src/sgml/ref/drop_trigger.sgml
doc/src/sgml/ref/drop_user_mapping.sgml
doc/src/sgml/ref/notify.sgml
doc/src/sgml/ref/pg_ctl-ref.sgml
doc/src/sgml/ref/pg_resetxlog.sgml
doc/src/sgml/ref/pgbench.sgml
doc/src/sgml/ref/pgupgrade.sgml
doc/src/sgml/ref/postgres-ref.sgml
doc/src/sgml/ref/select.sgml
doc/src/sgml/ref/update.sgml
doc/src/sgml/ref/vacuum.sgml
doc/src/sgml/ref/vacuumdb.sgml
doc/src/sgml/reference.sgml
doc/src/sgml/regress.sgml
doc/src/sgml/release.sgml
doc/src/sgml/rules.sgml
doc/src/sgml/runtime.sgml
doc/src/sgml/start.sgml
doc/src/sgml/trigger.sgml
doc/src/sgml/wal.sgml
doc/src/sgml/xaggr.sgml
doc/src/sgml/xfunc.sgml
src/Makefile
src/Makefile.global.in
src/Makefile.shlib
src/backend/Makefile
src/backend/access/common/heaptuple.c
src/backend/access/common/printtup.c
src/backend/access/hash/hashfunc.c
src/backend/access/heap/heapam.c
src/backend/access/heap/pruneheap.c
src/backend/access/heap/tuptoaster.c
src/backend/access/rmgrdesc/Makefile
src/backend/access/rmgrdesc/smgrdesc.c
src/backend/access/rmgrdesc/xactdesc.c
src/backend/access/transam/Makefile
src/backend/access/transam/clog.c
src/backend/access/transam/rmgr.c
src/backend/access/transam/slru.c
src/backend/access/transam/subtrans.c
src/backend/access/transam/transam.c
src/backend/access/transam/twophase.c
src/backend/access/transam/varsup.c
src/backend/access/transam/xact.c
src/backend/access/transam/xlog.c
src/backend/access/transam/xlogutils.c
src/backend/bootstrap/bootstrap.c
src/backend/catalog/Makefile
src/backend/catalog/catalog.c
src/backend/catalog/dependency.c
src/backend/catalog/genbki.pl
src/backend/catalog/heap.c
src/backend/catalog/index.c
src/backend/catalog/namespace.c
src/backend/catalog/pg_aggregate.c
src/backend/catalog/pg_proc.c
src/backend/catalog/storage.c
src/backend/commands/aggregatecmds.c
src/backend/commands/analyze.c
src/backend/commands/cluster.c
src/backend/commands/comment.c
src/backend/commands/copy.c
src/backend/commands/dbcommands.c
src/backend/commands/event_trigger.c
src/backend/commands/explain.c
src/backend/commands/extension.c
src/backend/commands/foreigncmds.c
src/backend/commands/indexcmds.c
src/backend/commands/matview.c
src/backend/commands/portalcmds.c
src/backend/commands/prepare.c
src/backend/commands/schemacmds.c
src/backend/commands/sequence.c
src/backend/commands/tablecmds.c
src/backend/commands/tablespace.c
src/backend/commands/trigger.c
src/backend/commands/vacuum.c
src/backend/commands/variable.c
src/backend/commands/view.c
src/backend/executor/Makefile
src/backend/executor/execAmi.c
src/backend/executor/execCurrent.c
src/backend/executor/execMain.c
src/backend/executor/execProcnode.c
src/backend/executor/execQual.c
src/backend/executor/execTuples.c
src/backend/executor/execUtils.c
src/backend/executor/functions.c
src/backend/executor/nodeAgg.c
src/backend/executor/nodeForeignscan.c
src/backend/executor/nodeModifyTable.c
src/backend/executor/nodeNestloop.c
src/backend/executor/nodeSubplan.c
src/backend/executor/nodeWindowAgg.c
src/backend/executor/spi.c
src/backend/libpq/be-fsstubs.c
src/backend/libpq/be-secure.c
src/backend/main/main.c
src/backend/nodes/bitmapset.c
src/backend/nodes/copyfuncs.c
src/backend/nodes/equalfuncs.c
src/backend/nodes/makefuncs.c
src/backend/nodes/nodeFuncs.c
src/backend/nodes/outfuncs.c
src/backend/nodes/print.c
src/backend/nodes/readfuncs.c
src/backend/optimizer/path/allpaths.c
src/backend/optimizer/path/costsize.c
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/planagg.c
src/backend/optimizer/plan/planner.c
src/backend/optimizer/plan/setrefs.c
src/backend/optimizer/plan/subselect.c
src/backend/optimizer/prep/prepjointree.c
src/backend/optimizer/prep/preptlist.c
src/backend/optimizer/prep/prepunion.c
src/backend/optimizer/util/pathnode.c
src/backend/optimizer/util/plancat.c
src/backend/optimizer/util/relnode.c
src/backend/parser/analyze.c
src/backend/parser/gram.y
src/backend/parser/parse_agg.c
src/backend/parser/parse_clause.c
src/backend/parser/parse_coerce.c
src/backend/parser/parse_expr.c
src/backend/parser/parse_relation.c
src/backend/parser/parse_target.c
src/backend/parser/parse_type.c
src/backend/parser/parse_utilcmd.c
src/backend/parser/parser.c
src/backend/parser/scan.l
src/backend/postmaster/autovacuum.c
src/backend/postmaster/pgstat.c
src/backend/postmaster/postmaster.c
src/backend/replication/logical/decode.c
src/backend/replication/logical/logicalfuncs.c
src/backend/replication/syncrep.c
src/backend/rewrite/rewriteHandler.c
src/backend/rewrite/rowsecurity.c
src/backend/storage/buffer/bufmgr.c
src/backend/storage/file/fd.c
src/backend/storage/file/reinit.c
src/backend/storage/ipc/ipci.c
src/backend/storage/ipc/procarray.c
src/backend/storage/ipc/procsignal.c
src/backend/storage/lmgr/lmgr.c
src/backend/storage/lmgr/lock.c
src/backend/storage/lmgr/lwlock.c
src/backend/storage/lmgr/predicate.c
src/backend/storage/lmgr/proc.c
src/backend/tcop/dest.c
src/backend/tcop/postgres.c
src/backend/tcop/pquery.c
src/backend/tcop/utility.c
src/backend/utils/adt/array_userfuncs.c
src/backend/utils/adt/arrayfuncs.c
src/backend/utils/adt/date.c
src/backend/utils/adt/dbsize.c
src/backend/utils/adt/float.c
src/backend/utils/adt/json.c
src/backend/utils/adt/jsonb.c
src/backend/utils/adt/lockfuncs.c
src/backend/utils/adt/misc.c
src/backend/utils/adt/numeric.c
src/backend/utils/adt/pseudotypes.c
src/backend/utils/adt/ri_triggers.c
src/backend/utils/adt/rowtypes.c
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/selfuncs.c
src/backend/utils/adt/timestamp.c
src/backend/utils/adt/varlena.c
src/backend/utils/adt/version.c
src/backend/utils/cache/inval.c
src/backend/utils/cache/lsyscache.c
src/backend/utils/cache/plancache.c
src/backend/utils/cache/relcache.c
src/backend/utils/cache/syscache.c
src/backend/utils/errcodes.txt
src/backend/utils/error/elog.c
src/backend/utils/init/globals.c
src/backend/utils/init/miscinit.c
src/backend/utils/init/postinit.c
src/backend/utils/misc/guc.c
src/backend/utils/misc/postgresql.conf.sample
src/backend/utils/mmgr/mcxt.c
src/backend/utils/mmgr/portalmem.c
src/backend/utils/resowner/resowner.c
src/backend/utils/sort/tuplesort.c
src/backend/utils/sort/tuplestore.c
src/backend/utils/time/combocid.c
src/backend/utils/time/snapmgr.c
src/backend/utils/time/tqual.c
src/bin/Makefile
src/bin/initdb/initdb.c
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dump.h
src/bin/pg_dump/pg_dumpall.c
src/bin/pg_rewind/filemap.c
src/bin/pg_xlogdump/rmgrdesc.c
src/bin/pgbench/pgbench.c
src/bin/psql/command.c
src/bin/psql/describe.c
src/bin/psql/startup.c
src/bin/psql/tab-complete.c
src/common/Makefile
src/common/relpath.c
src/include/Makefile
src/include/access/hash.h
src/include/access/htup.h
src/include/access/rmgrlist.h
src/include/access/sysattr.h
src/include/access/transam.h
src/include/access/twophase.h
src/include/access/xact.h
src/include/access/xlog.h
src/include/bootstrap/bootstrap.h
src/include/c.h
src/include/catalog/catalog.h
src/include/catalog/dependency.h
src/include/catalog/heap.h
src/include/catalog/indexing.h
src/include/catalog/namespace.h
src/include/catalog/pg_aggregate.h
src/include/catalog/pg_class.h
src/include/catalog/pg_namespace.h
src/include/catalog/pg_proc.h
src/include/catalog/pg_type.h
src/include/commands/dbcommands.h
src/include/commands/explain.h
src/include/commands/prepare.h
src/include/commands/schemacmds.h
src/include/commands/sequence.h
src/include/commands/tablecmds.h
src/include/commands/trigger.h
src/include/commands/vacuum.h
src/include/commands/variable.h
src/include/common/relpath.h
src/include/executor/execdesc.h
src/include/executor/executor.h
src/include/executor/spi.h
src/include/executor/tuptable.h
src/include/libpq/libpq-be.h
src/include/miscadmin.h
src/include/nodes/bitmapset.h
src/include/nodes/execnodes.h
src/include/nodes/nodes.h
src/include/nodes/params.h
src/include/nodes/parsenodes.h
src/include/nodes/pg_list.h
src/include/nodes/plannodes.h
src/include/nodes/primnodes.h
src/include/nodes/relation.h
src/include/optimizer/cost.h
src/include/optimizer/pathnode.h
src/include/optimizer/planmain.h
src/include/optimizer/planner.h
src/include/parser/analyze.h
src/include/parser/gramparse.h
src/include/parser/kwlist.h
src/include/parser/parse_agg.h
src/include/parser/parse_func.h
src/include/parser/parse_relation.h
src/include/parser/parse_utilcmd.h
src/include/parser/parser.h
src/include/parser/scanner.h
src/include/pg_config.h.in
src/include/pg_config.h.win32
src/include/pgstat.h
src/include/port.h
src/include/postgres.h
src/include/postmaster/autovacuum.h
src/include/rewrite/rewriteHandler.h
src/include/storage/backendid.h
src/include/storage/lock.h
src/include/storage/lwlock.h
src/include/storage/proc.h
src/include/storage/procarray.h
src/include/storage/procsignal.h
src/include/storage/relfilenode.h
src/include/storage/smgr.h
src/include/tcop/dest.h
src/include/tcop/pquery.h
src/include/tcop/tcopprot.h
src/include/tcop/utility.h
src/include/utils/builtins.h
src/include/utils/elog.h
src/include/utils/guc.h
src/include/utils/guc_tables.h
src/include/utils/json.h
src/include/utils/lsyscache.h
src/include/utils/plancache.h
src/include/utils/portal.h
src/include/utils/rel.h
src/include/utils/resowner_private.h
src/include/utils/snapshot.h
src/include/utils/syscache.h
src/include/utils/timestamp.h
src/include/utils/tuplesort.h
src/include/utils/tuplestore.h
src/interfaces/libpq/fe-auth.c
src/pl/plpgsql/src/pl_exec.c
src/pl/plpgsql/src/pl_gram.y
src/port/getpeereid.c
src/test/regress/expected/aggregates.out
src/test/regress/expected/alter_generic.out
src/test/regress/expected/alter_table.out
src/test/regress/expected/arrays.out
src/test/regress/expected/box.out
src/test/regress/expected/brin.out
src/test/regress/expected/case.out
src/test/regress/expected/cluster.out
src/test/regress/expected/copy2.out
src/test/regress/expected/create_index.out
src/test/regress/expected/create_table_like.out
src/test/regress/expected/create_view.out
src/test/regress/expected/date.out
src/test/regress/expected/domain.out
src/test/regress/expected/drop_if_exists.out
src/test/regress/expected/event_trigger.out
src/test/regress/expected/float8.out
src/test/regress/expected/foreign_data.out
src/test/regress/expected/foreign_key.out
src/test/regress/expected/gist.out
src/test/regress/expected/groupingsets.out
src/test/regress/expected/inherit.out
src/test/regress/expected/insert.out
src/test/regress/expected/insert_conflict.out
src/test/regress/expected/int2.out
src/test/regress/expected/int4.out
src/test/regress/expected/int8.out
src/test/regress/expected/join.out
src/test/regress/expected/matview.out
src/test/regress/expected/name.out
src/test/regress/expected/numeric.out
src/test/regress/expected/object_address.out
src/test/regress/expected/opr_sanity.out
src/test/regress/expected/plancache.out
src/test/regress/expected/plpgsql.out
src/test/regress/expected/prepared_xacts.out
src/test/regress/expected/rangefuncs.out
src/test/regress/expected/rangetypes.out
src/test/regress/expected/replica_identity.out
src/test/regress/expected/roleattributes.out
src/test/regress/expected/rolenames.out
src/test/regress/expected/rowsecurity.out
src/test/regress/expected/rowtypes.out
src/test/regress/expected/rules.out
src/test/regress/expected/sanity_check.out
src/test/regress/expected/select.out
src/test/regress/expected/select_distinct.out
src/test/regress/expected/select_into.out
src/test/regress/expected/sequence.out
src/test/regress/expected/sequence_1.out
src/test/regress/expected/stats.out
src/test/regress/expected/tablesample.out
src/test/regress/expected/text.out
src/test/regress/expected/timestamp.out
src/test/regress/expected/timestamptz.out
src/test/regress/expected/transactions.out
src/test/regress/expected/triggers.out
src/test/regress/expected/tsearch.out
src/test/regress/expected/txid.out
src/test/regress/expected/updatable_views.out
src/test/regress/expected/vacuum.out
src/test/regress/expected/with.out
src/test/regress/expected/xml.out
src/test/regress/expected/xml_1.out
src/test/regress/input/create_function_2.source
src/test/regress/input/largeobject.source
src/test/regress/output/constraints.source
src/test/regress/output/create_function_2.source
src/test/regress/output/misc.source
src/test/regress/output/tablespace.source
src/test/regress/parallel_schedule
src/test/regress/pg_regress.c
src/test/regress/serial_schedule
src/test/regress/sql/aggregates.sql
src/test/regress/sql/alter_table.sql
src/test/regress/sql/arrays.sql
src/test/regress/sql/box.sql
src/test/regress/sql/case.sql
src/test/regress/sql/cluster.sql
src/test/regress/sql/create_index.sql
src/test/regress/sql/create_table.sql
src/test/regress/sql/create_table_like.sql
src/test/regress/sql/date.sql
src/test/regress/sql/domain.sql
src/test/regress/sql/float8.sql
src/test/regress/sql/foreign_data.sql
src/test/regress/sql/foreign_key.sql
src/test/regress/sql/inherit.sql
src/test/regress/sql/insert.sql
src/test/regress/sql/insert_conflict.sql
src/test/regress/sql/int2.sql
src/test/regress/sql/int4.sql
src/test/regress/sql/int8.sql
src/test/regress/sql/join.sql
src/test/regress/sql/matview.sql
src/test/regress/sql/name.sql
src/test/regress/sql/numeric.sql
src/test/regress/sql/opr_sanity.sql
src/test/regress/sql/plpgsql.sql
src/test/regress/sql/portals.sql
src/test/regress/sql/prepared_xacts.sql
src/test/regress/sql/privileges.sql
src/test/regress/sql/rangefuncs.sql
src/test/regress/sql/rangetypes.sql
src/test/regress/sql/rowsecurity.sql
src/test/regress/sql/rowtypes.sql
src/test/regress/sql/rules.sql
src/test/regress/sql/select.sql
src/test/regress/sql/select_distinct.sql
src/test/regress/sql/sequence.sql
src/test/regress/sql/timestamp.sql
src/test/regress/sql/timestamptz.sql
src/test/regress/sql/triggers.sql
src/test/regress/sql/tsearch.sql
src/test/regress/sql/updatable_views.sql
src/test/regress/sql/vacuum.sql
src/test/regress/sql/with.sql
src/test/regress/sql/xml.sql

diff --cc .gitignore
Simple merge
diff --cc configure
index 8711af0d3a596912f4c5d80b4ccb2a84774e5e11,7244c755a76378e72e947f2aa6dd39c69011c64c..cbfcb1815723526b8a0aa991f8a58a77b03f9f80
+++ b/configure
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for PostgreSQL 9.5alpha1 (Postgres-XL 9.5alpha1).
 -# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6beta4.
++# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6beta4 (Postgres-XL 9.6alpha1).
  #
 -# Report bugs to <pgsql-bugs@postgresql.org>.
 +# Report bugs to <bugs@postgres-xl.org>.
  #
  #
  # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@@ -582,10 -582,9 +582,10 @@@ MAKEFLAGS
  # Identity of this package.
  PACKAGE_NAME='PostgreSQL'
  PACKAGE_TARNAME='postgresql'
- PACKAGE_VERSION='9.5alpha1 (Postgres-XL 9.5alpha1)'
- PACKAGE_XC_VERSION='9.5alpha1'
- PACKAGE_STRING='PostgreSQL 9.5alpha1 (Postgres-XL 9.5alpha1)'
 -PACKAGE_VERSION='9.6beta4'
 -PACKAGE_STRING='PostgreSQL 9.6beta4'
 -PACKAGE_BUGREPORT='[email protected]'
++PACKAGE_VERSION='9.6beta4 (Postgres-XL 9.6alpha1)'
++PACKAGE_XC_VERSION='9.6alpha1'
++PACKAGE_STRING='PostgreSQL 9.6beta4 (Postgres-XL 9.6alpha1)'
 +PACKAGE_BUGREPORT='[email protected]'
  PACKAGE_URL=''
  
  ac_unique_file="src/backend/access/common/heaptuple.c"
@@@ -1398,7 -1398,7 +1402,7 @@@ if test "$ac_init_help" = "long"; the
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
- \`configure' configures PostgreSQL 9.5alpha1 (Postgres-XL 9.5alpha1) to adapt to many kinds of systems.
 -\`configure' configures PostgreSQL 9.6beta4 to adapt to many kinds of systems.
++\`configure' configures PostgreSQL 9.6beta4 (Postgres-XL 9.6alpha1) to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-      short | recursive ) echo "Configuration of PostgreSQL 9.5alpha1 (Postgres-XL 9.5alpha1):";;
 -     short | recursive ) echo "Configuration of PostgreSQL 9.6beta4:";;
++     short | recursive ) echo "Configuration of PostgreSQL 9.6beta4 (Postgres-XL 9.6alpha1):";;
     esac
    cat <<\_ACEOF
  
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- PostgreSQL configure 9.5alpha1 (Postgres-XL 9.5alpha1)
 -PostgreSQL configure 9.6beta4
++PostgreSQL configure 9.6beta4 (Postgres-XL 9.6alpha1)
  generated by GNU Autoconf 2.69
  
  Copyright (C) 2012 Free Software Foundation, Inc.
@@@ -2324,7 -2326,7 +2330,7 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by PostgreSQL $as_me 9.5alpha1 (Postgres-XL 9.5alpha1), which was
 -It was created by PostgreSQL $as_me 9.6beta4, which was
++It was created by PostgreSQL $as_me 9.6beta4 (Postgres-XL 9.6alpha1), which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
    $ $0 $@
@@@ -15538,10 -15873,8 +15920,11 @@@ cat >>confdefs.h <<_ACEO
  _ACEOF
  
  
 +# For PGXC, set -DPGXC by default. This can be overriden with -UPGXC if the user sets it.
 +# For Postgres-XL, set both -DPGXC and -DXCP  
 +CFLAGS="-DPGXC -DXCP $CFLAGS"
  
  # Begin output steps
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5
@@@ -16100,7 -16433,7 +16483,7 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by PostgreSQL $as_me 9.5alpha1 (Postgres-XL 9.5alpha1), which was
 -This file was extended by PostgreSQL $as_me 9.6beta4, which was
++This file was extended by PostgreSQL $as_me 9.6beta4 (Postgres-XL 9.6alpha1), which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
@@@ -16170,7 -16503,7 +16553,7 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- PostgreSQL config.status 9.5alpha1 (Postgres-XL 9.5alpha1)
 -PostgreSQL config.status 9.6beta4
++PostgreSQL config.status 9.6beta4 (Postgres-XL 9.6alpha1)
  configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
  
diff --cc configure.in
index 17b061146e02d447b6262d2aef7811700bf54b13,598fbd8f640770165840bca83ed6a68dd25b4c93..3c77bebcdce6385571f759e85f3fc6fe1e1cc4a5
@@@ -17,7 -17,7 +17,7 @@@ dnl Read the Autoconf manual for detail
  dnl
  m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [9.5alpha1 (Postgres-XL 9.5alpha1)], [[email protected]])
 -AC_INIT([PostgreSQL], [9.6beta4], [[email protected]])
++AC_INIT([PostgreSQL], [9.6beta4 (Postgres-XL 9.6alpha1)], [[email protected]])
  
  m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
  Untested combinations of 'autoconf' and PostgreSQL versions are not
index 7ed90d4df734e742e162732c634f5bbcbc038228,25263c0be9494a5ee7943190088e184e4ebcb3cd..fedc61b243eb9fe4279df2d55e9e3f8cc1f3f13f
@@@ -37,9 -38,7 +38,10 @@@ SUBDIRS = 
                pgcrypto        \
                pgrowlocks      \
                pgstattuple     \
 +              pgxc_clean      \
 +              pgxc_ctl        \
 +              pgxc_monitor \
+               pg_visibility   \
                postgres_fdw    \
                seg             \
                spi             \
index 7222731f3a79a69cf26c76b7e146236debe1ecca,e39d3eee61bb5b59f72d0aae452acc7340c38783..3623f9d91ce695d685d70d015ecf9c676b8e1d83
mode 100755,100644..100755
@@@ -3,10 -3,11 +3,11 @@@
  MODULES = citext
  
  EXTENSION = citext
- DATA = citext--1.1.sql citext--1.0--1.1.sql citext--unpackaged--1.0.sql
+ DATA = citext--1.3.sql citext--1.2--1.3.sql citext--1.1--1.2.sql \
+       citext--1.0--1.1.sql citext--unpackaged--1.0.sql
  PGFILEDESC = "citext - case-insensitive character string data type"
  
 -REGRESS = citext
 +REGRESS = citext xl_citext
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
index d2791a5eb4695d65779cf1eb11e12e2a0b73b960,462d42a3bd822b2b4625ab1d8b1e9f1de09bd6bf..6515fbd571eed16e645377183e2f9d5e53864577
@@@ -519,19 -502,17 +502,17 @@@ SELECT name FROM srt WHERE name !~ 'A$
  (3 rows)
  
  -- SIMILAR TO should be case-insensitive.
 -SELECT name FROM srt WHERE name SIMILAR TO '%a.*';
 +SELECT name FROM srt WHERE name SIMILAR TO '%a.*' order by name;
   name 
  ------
-  AAA
-  aba
- (2 rows)
+  ABA
+ (1 row)
  
 -SELECT name FROM srt WHERE name SIMILAR TO '%A.*';
 +SELECT name FROM srt WHERE name SIMILAR TO '%A.*' order by name;
   name 
  ------
-  AAA
-  aba
- (2 rows)
+  ABA
+ (1 row)
  
  -- Explicit casts.
  SELECT true::citext = 'true' AS t;
Simple merge
Simple merge
Simple merge
Simple merge
index 342e75ee48d30470d6e103bebcb71917d8b3381d,c101603e6cdd11cee7816cde5045b71226f1c010..39ecd6080424ddd2cd046b99a7008e8e617ccf03
mode 100755,100644..100755
@@@ -6,10 -6,10 +6,10 @@@ OBJS =        ltree_io.o ltree_op.o lquery_op
  PG_CPPFLAGS = -DLOWER_NODE
  
  EXTENSION = ltree
- DATA = ltree--1.0.sql ltree--unpackaged--1.0.sql
+ DATA = ltree--1.1.sql ltree--1.0--1.1.sql ltree--unpackaged--1.0.sql
  PGFILEDESC = "ltree - hierarchical label data type"
  
 -REGRESS = ltree
 +REGRESS = ltree xl_ltree
  
  ifdef USE_PGXS
  PG_CONFIG = pg_config
Simple merge
Simple merge
index 561f4216a96d3e435edbc2df00a87e715ad261d4,55347721968e3f59cf5bc55a08d433fcc1f51552..b0ec8a3f02c4a7c68470e9af3073d5ebfbd9f0f3
@@@ -27,7 -27,7 +27,7 @@@ System Configuration
  
    Operating System (example: Linux 2.4.18)    :
  
-   PostgreSQL version (example: PostgreSQL 9.5alpha1):  Postgres-XL 9.5alpha1
 -  PostgreSQL version (example: PostgreSQL 9.6beta4):  PostgreSQL 9.6beta4
++  PostgreSQL version (example: PostgreSQL 9.6beta4):  Postgres-XL 9.6alpha1
  
    Compiler used (example: gcc 3.3.5)          :
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2752ac850f544a04399dcd84b5bc40059cfee8ba,c8708ecf8bbe923339f2565e462f442c0363e62d..fdc7a0753474cb516d11ab2f68b1fe1f1fad5d46
@@@ -132,10 -133,7 +133,11 @@@ CREATE EXTENSION <replaceable>module_na
   &pgstatstatements;
   &pgstattuple;
   &pgtrgm;
 + &pgxcclean;
 + &pgxcctl;
 + &pgxcddl;
 + &pgxcmonitor;
+  &pgvisibility;
   &postgres-fdw;
   &seg;
   &sepgsql;
Simple merge
Simple merge
index 70af9e066473a46e8354eac07c0150818b8af3b5,a393813b3809df196fed11dcb266bb4950e14823..f7841719831b4232f8ae90c0e2a833914fa88ee7
mode 100755,100644..100755
@@@ -737,14 -635,16 +728,24 @@@ CREATE TABLE example 
      usually best to follow it.
     </para>
  
 +   <para>
 +    As mentioned when discussing <type>UNIQUE</> constraint, the distribution column
 +    must be included in <type>PRIMARY KEY</type>.  Other restrictions
 +    apply to the <type>PRIMARY KEY</> as well.  When an expression is used on
 +    a <type>PRIMARY KEY</> constraint, this expression must contain
 +    the distribution column of its parent table. It cannot use other
 +    columns as well.
 +   </para>
+    <para>
+     Primary keys are useful both for
+     documentation purposes and for client applications.  For example,
+     a GUI application that allows modifying row values probably needs
+     to know the primary key of a table to be able to identify rows
+     uniquely.  There are also various ways in which the database system
+     makes use of a primary key if one has been declared; for example,
+     the primary key defines the default target column(s) for foreign keys
+     referencing its table.
+    </para>
    </sect2>
  
    <sect2 id="ddl-constraints-fk">
index 3e7a67ef9b73fc445189b252b1fab9e46da73026,43837114baee804cf39c9e7c2024bb1b884f9f4b..eba66890885cf249492788fb580fcf77bc93a1de
  <!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
  <!ENTITY pgstattuple     SYSTEM "pgstattuple.sgml">
  <!ENTITY pgtrgm          SYSTEM "pgtrgm.sgml">
+ <!ENTITY pgvisibility    SYSTEM "pgvisibility.sgml">
  <!ENTITY postgres-fdw    SYSTEM "postgres-fdw.sgml">
 +<!ENTITY pgxcclean       SYSTEM "pgxcclean.sgml">
 +<!ENTITY pgxcctl         SYSTEM "pgxc_ctl-ref.sgml">
 +<!ENTITY pgxcddl         SYSTEM "pgxcddl.sgml">
 +<!ENTITY pgxcmonitor     SYSTEM "pgxcmonitor.sgml">
  <!ENTITY seg             SYSTEM "seg.sgml">
  <!ENTITY contrib-spi     SYSTEM "contrib-spi.sgml">
  <!ENTITY sepgsql         SYSTEM "sepgsql.sgml">
  <!ENTITY sourcerepo SYSTEM "sourcerepo.sgml">
  
  <!ENTITY release    SYSTEM "release.sgml">
+ <!ENTITY release-9.6    SYSTEM "release-9.6.sgml">
 +<!ENTITY release-xl-9.5r1    SYSTEM "release-xl-9.5r1.sgml">
  <!ENTITY release-9.5    SYSTEM "release-9.5.sgml">
  <!ENTITY release-9.4    SYSTEM "release-9.4.sgml">
  <!ENTITY release-9.3    SYSTEM "release-9.3.sgml">
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 78092caeb37bdc74cba126158e8ce98c3adfc34b,84bc7beb5adf4dfabbb3c6a16f692cab8e896dfb..ae7f5a7d317f198d9409c40f3824a30e452f94aa
@@@ -1,27 -1,11 +1,27 @@@
  <!-- doc/src/sgml/legal.sgml -->
  
- <date>2015</date>
+ <date>2016</date>
  
  <copyright>
-  <year>1996-2015</year>
+  <year>1996-2016</year>
   <holder>The PostgreSQL Global Development Group</holder>
  </copyright>
 +<copyright>
 + <year>2014-2016</year>
 + <holder>Postgres-XL Development Group</holder>
 +</copyright>
 +<copyright>
 + <year>2009-2012</year>
 + <holder>Postgres-XC Development Group</holder>
 +</copyright>
 +<copyright>
 + <year>2012-2014</year>
 + <holder>TransLattice, Inc.</holder>
 +</copyright>
 +<copyright>
 + <year>2015-2016</year>
 + <holder>2ndQuadrant Ltd</holder>
 +</copyright>
  
  <legalnotice id="legalnotice">
   <title>Legal Notice</title>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0deb459f1fd3dc34c3596ff0fc0cf4333a11525d,77667bdebd1e68028658a0274da3ad32e89b4def..0c5e3b350e0f23ad0267e2fda4deadd41b931b16
@@@ -54,8 -52,8 +54,9 @@@ Complete list of usable sgml source fil
  <!ENTITY commit             SYSTEM "commit.sgml">
  <!ENTITY commitPrepared     SYSTEM "commit_prepared.sgml">
  <!ENTITY copyTable          SYSTEM "copy.sgml">
+ <!ENTITY createAccessMethod SYSTEM "create_access_method.sgml">
  <!ENTITY createAggregate    SYSTEM "create_aggregate.sgml">
 +<!ENTITY createBarrier      system "create_barrier.sgml">
  <!ENTITY createCast         SYSTEM "create_cast.sgml">
  <!ENTITY createCollation    SYSTEM "create_collation.sgml">
  <!ENTITY createConversion   SYSTEM "create_conversion.sgml">
Simple merge
index e5a677925dba0ea4f743bdb2972dda304df08f26,6f51cbc8962cc674bbaccbf51315cfcc0ed14701..8deb80ab63c052eb7eac0c4aad3866437736b070
mode 100755,100644..100755
Simple merge
Simple merge
index c8ebcac1c691fc656039d15471c46c2faca96ada,6a8acfb4f9ce2c396e386f9ca2dfbe07e142d1f4..c676b82b349d57630453915757f874873c110029
@@@ -28,8 -27,10 +28,11 @@@ CREATE AGGREGATE <replaceable class="pa
      [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ]
      [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
      [ , FINALFUNC_EXTRA ]
+     [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ]
+     [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ]
+     [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ]
      [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
 +    [ , INITCOLLECT = <replaceable class="PARAMETER">initial_collection_condition</replaceable> ]
      [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ]
      [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ]
      [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ]
@@@ -49,7 -50,7 +53,8 @@@ CREATE AGGREGATE <replaceable class="pa
      [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
      [ , FINALFUNC_EXTRA ]
      [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
 +    [ , INITCOLLECT = <replaceable class="PARAMETER">initial_collection_condition</replaceable> ]
+     [ , PARALLEL = { SAFE | RESTRICTED | UNSAFE } ]
      [ , HYPOTHETICAL ]
  )
  
@@@ -63,8 -63,10 +68,11 @@@ CREATE AGGREGATE <replaceable class="PA
      [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ]
      [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
      [ , FINALFUNC_EXTRA ]
+     [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ]
+     [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ]
+     [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ]
      [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
 +    [ , INITCOLLECT = <replaceable class="PARAMETER">initial_collection_condition</replaceable> ]
      [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ]
      [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ]
      [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ]
Simple merge
Simple merge
Simple merge
index 0c9b752c95c0620db902ca65336017b0ac471728,bf2ad64d66e3a40011a06a9904bce0a70aae09d6..2b842d5fb980b7d71e787d3e7952c15f74605a02
mode 100755,100644..100755
@@@ -544,16 -529,12 +551,18 @@@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORAR
       </para>
  
       <para>
-       The primary key constraint should name a set of columns that is
-       different from other sets of columns named by any unique
-       constraint defined for the same table.
+       <literal>PRIMARY KEY</literal> enforces the same data constraints as
+       a combination of <literal>UNIQUE</> and <literal>NOT NULL</>, but
+       identifying a set of columns as the primary key also provides metadata
+       about the design of the schema, since a primary key implies that other
+       tables can rely on this set of columns as a unique identifier for rows.
       </para>
 +
 +     <para>
 +      In <productname>Postgres-XL</>, if <command>DISTRIBUTE BY REPLICATION</> is not specified, the
 +      distribution key must be included in the set of primary key
 +      columns.
 +     </para>
      </listitem>
     </varlistentry>
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index de64adf78944e4c6eee8de57640c3331bbd552da,fd9d0be6f44c40a567d69896dbe934bb069bf076..e72021764a349e73a3cc534360b5241f043f1d9b
@@@ -222,12 -281,13 +281,19 @@@ PostgreSQL documentatio
     <command>pg_resetxlog</command> to run.  But before you do
     so, make doubly certain that there is no server process still alive.
    </para>
 +
 +  <para>
 +   In <productname>Postgres-XL</>, <command>pg_resetxlog</command>
 +   will only run locally for Coordinators and Datanodes.  You should run it
 +   for each Coordinator or Datanode manually.
 +  </para>
   </refsect1>
  
+  <refsect1>
+   <title>See Also</title>
+   <simplelist type="inline">
+    <member><xref linkend="app-pgcontroldata"></member>
+   </simplelist>
+  </refsect1>
  </refentry>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1d71d95d473a90801ee87a969880cd99e7db60ef,8acdff1393fd2d1460f5e707c8ada4840bdf8620..adfd95aea019a881d8959450a6b72c5400a1c6e0
@@@ -82,8 -80,8 +82,9 @@@
     &commit;
     &commitPrepared;
     &copyTable;
+    &createAccessMethod;
     &createAggregate;
 +   &createBarrier;
     &createCast;
     &createCollation;
     &createConversion;
Simple merge
index 70e53afc99c0e39bc61274a7346403b1746baf7e,472c1f6f128d15135f48c1384b467cd67c7c2ae7..eace76cace728b9b586c1e4ad7c789283149b94f
@@@ -73,7 -73,7 +73,8 @@@ For new features, add links to the docu
    The reason for splitting the release notes this way is so that appropriate
    subsets can easily be copied into back branches.
  -->
+ &release-9.6;
 +&release-xl-9.5r1;
  &release-9.5;
  &release-9.4;
  &release-9.3;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/Makefile
index b2295597bf92176ad89fcc0cc9266cdf4c332495,b526be798596b4da3472d0701ac2133600f4b059..5706bb13352b6348e984dc4a51441eead78318a6
@@@ -22,7 -20,9 +22,8 @@@ SUBDIRS = 
        backend/utils/mb/conversion_procs \
        backend/snowball \
        include \
 -      interfaces \
        backend/replication/libpqwalreceiver \
+       fe_utils \
        bin \
        pl \
        makefiles \
index de335abf0bcfb46ffac47d7538ee30614501c156,c211a2d2e753fe7ec10237af855618d8aeb6be8d..64b7b73d162f4fa335027021ae1f79c8aafcc387
@@@ -37,12 -37,27 +37,28 @@@ all
  
  # PostgreSQL version number
  VERSION = @PACKAGE_VERSION@
 +XLVERSION = @PACKAGE_XC_VERSION@
  MAJORVERSION = @PG_MAJORVERSION@
+ VERSION_NUM = @PG_VERSION_NUM@
  
- # Support for VPATH builds
- # (PGXS VPATH support is handled separately in pgxs.mk)
- ifndef PGXS
+ # Set top_srcdir, srcdir, and VPATH.
+ ifdef PGXS
+ top_srcdir = $(top_builddir)
+ # If VPATH is set or Makefile is not in current directory we are building
+ # the extension with VPATH so we set the variable here.
+ ifdef VPATH
+ srcdir = $(VPATH)
+ else
+ ifeq ($(CURDIR),$(dir $(firstword $(MAKEFILE_LIST))))
+ srcdir = .
+ VPATH =
+ else
+ srcdir = $(dir $(firstword $(MAKEFILE_LIST)))
+ VPATH = $(srcdir)
+ endif
+ endif
+ else # not PGXS
  vpath_build = @vpath_build@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
Simple merge
Simple merge
index 79766121c3229136d2ba6c465858636c5ac8cfa9,6d0f3f37673a5d3a48358149213405f7bbadde43..15a18a51cc4924f4750109890084230e1089fc0e
@@@ -45,8 -45,7 +45,8 @@@
   * and we'd like to still refer to them via C struct offsets.
   *
   *
-  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
 + * Portions Copyright (c) 2012-2014, TransLattice, Inc.
+  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
   *
index 31712da34bc5380bc9bd0abf2b920bd98d4b3fd1,d9664aa6c6b918cbf3a322f37ad77784f9bd64bd..5679a18d62ffe91017d5c5aebcc69a17dd9c3a01
@@@ -5,8 -5,7 +5,8 @@@
   *      clients and standalone backends are supported here).
   *
   *
-  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
 + * Portions Copyright (c) 2012-2014, TransLattice, Inc.