Merge commit '80edfd76591fdb9beec061de3c05ef4e9d96ce56' into postgres-xc/master

This is the merge of Postgres-XC master branch with the intersection of
PostgreSQL master branch and 9.2 stable branch.
All the manual conflicts are solved, please note that the code does not
compile yet. All the compilation will be solved later.

Conflicts:
	COPYRIGHT
	GNUmakefile.in
	configure
	configure.in
	contrib/pgbench/pgbench.c
	contrib/sepgsql/hooks.c
	src/backend/access/common/heaptuple.c
	src/backend/access/heap/heapam.c
	src/backend/access/transam/Makefile
	src/backend/access/transam/rmgr.c
	src/backend/access/transam/twophase.c
	src/backend/access/transam/varsup.c
	src/backend/access/transam/xact.c
	src/backend/catalog/Makefile
	src/backend/commands/comment.c
	src/backend/commands/copy.c
	src/backend/commands/explain.c
	src/backend/commands/indexcmds.c
	src/backend/commands/prepare.c
	src/backend/commands/tablecmds.c
	src/backend/commands/view.c
	src/backend/executor/functions.c
	src/backend/executor/spi.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/makefuncs.c
	src/backend/optimizer/path/allpaths.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/planner.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/optimizer/util/var.c
	src/backend/parser/analyze.c
	src/backend/parser/gram.y
	src/backend/parser/parse_agg.c
	src/backend/postmaster/postmaster.c
	src/backend/storage/ipc/procarray.c
	src/backend/storage/lmgr/proc.c
	src/backend/tcop/postgres.c
	src/backend/tcop/utility.c
	src/backend/utils/adt/dbsize.c
	src/backend/utils/adt/lockfuncs.c
	src/backend/utils/adt/misc.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/cache/plancache.c
	src/backend/utils/misc/guc.c
	src/bin/initdb/initdb.c
	src/bin/pg_ctl/pg_ctl.c
	src/bin/pg_dump/pg_dump.c
	src/bin/psql/startup.c
	src/bin/psql/tab-complete.c
	src/include/Makefile
	src/include/access/rmgr.h
	src/include/access/xact.h
	src/include/catalog/catversion.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_proc.h
	src/include/commands/explain.h
	src/include/commands/schemacmds.h
	src/include/nodes/parsenodes.h
	src/include/nodes/pg_list.h
	src/include/nodes/primnodes.h
	src/include/optimizer/pathnode.h
	src/include/optimizer/var.h
	src/include/pg_config.h.win32
	src/include/storage/proc.h
	src/include/utils/plancache.h
	src/include/utils/snapshot.h
	src/include/utils/timestamp.h
	src/test/regress/expected/aggregates.out
	src/test/regress/expected/create_index.out
	src/test/regress/expected/inherit.out
	src/test/regress/expected/rangefuncs.out
	src/test/regress/expected/sanity_check.out
	src/test/regress/expected/sequence.out
	src/test/regress/expected/with.out
	src/test/regress/output/constraints.source
	src/test/regress/sql/inherit.sql
	src/test/regress/sql/rules.sql

1 files changed, 25 insertions, 1 deletions

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index e951cf7a92..d0b15547cc 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -10,7 +10,7 @@
  *	  Over time, this has also become the preferred place for widely known
  *	  resource-limitation stuff, such as work_mem and check_stack_depth().
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/miscadmin.h
@@ -55,6 +55,11 @@
  * course, only if the interrupt holdoff counter is zero).	See the
  * related code for details.
  *
+ * A lost connection is handled similarly, although the loss of connection
+ * does not raise a signal, but is detected when we fail to write to the
+ * socket. If there was a signal for a broken connection, we could make use of
+ * it by setting ClientConnectionLost in the signal handler.
+ *
  * A related, but conceptually distinct, mechanism is the "critical section"
  * mechanism.  A critical section not only holds off cancel/die interrupts,
  * but causes any ereport(ERROR) or ereport(FATAL) to become ereport(PANIC)
@@ -70,6 +75,8 @@ extern PGDLLIMPORT volatile bool InterruptPending;
 extern volatile bool QueryCancelPending;
 extern volatile bool ProcDiePending;
 
+extern volatile bool ClientConnectionLost;
+
 /* these are marked volatile because they are examined by signal handlers: */
 extern volatile bool ImmediateInterruptOK;
 extern PGDLLIMPORT volatile uint32 InterruptHoldoffCount;
@@ -230,11 +237,28 @@ extern int	VacuumCostPageDirty;
 extern int	VacuumCostLimit;
 extern int	VacuumCostDelay;
 
+extern int	VacuumPageHit;
+extern int	VacuumPageMiss;
+extern int	VacuumPageDirty;
+
 extern int	VacuumCostBalance;
 extern bool VacuumCostActive;
 
 
 /* in tcop/postgres.c */
+
+#if defined(__ia64__) || defined(__ia64)
+typedef struct
+{
+	char	   *stack_base_ptr;
+	char	   *register_stack_base_ptr;
+} pg_stack_base_t;
+#else
+typedef char *pg_stack_base_t;
+#endif
+
+extern pg_stack_base_t set_stack_base(void);
+extern void restore_stack_base(pg_stack_base_t base);
 extern void check_stack_depth(void);
 
 /* in tcop/utility.c */