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, 5 insertions, 5 deletions

diff --git a/src/include/postgres.h b/src/include/postgres.h
index 190df0ed9b..10b3d16760 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -7,7 +7,7 @@
  * Client-side code should include postgres_fe.h instead.
  *
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
@@ -656,14 +656,14 @@ extern PGDLLIMPORT bool assert_enabled;
 /*
  *	TrapMacro is the same as Trap but it's intended for use in macros:
  *
- *		#define foo(x) (AssertMacro(x != 0) && bar(x))
+ *		#define foo(x) (AssertMacro(x != 0), bar(x))
  *
  *	Isn't CPP fun?
  */
 #define TrapMacro(condition, errorType) \
 	((bool) ((! assert_enabled) || ! (condition) || \
 			 (ExceptionalCondition(CppAsString(condition), (errorType), \
-								   __FILE__, __LINE__))))
+								   __FILE__, __LINE__), 0)))
 
 #ifndef USE_ASSERT_CHECKING
 #define Assert(condition)
@@ -684,9 +684,9 @@ extern PGDLLIMPORT bool assert_enabled;
 		Trap(!(condition), "BadState")
 #endif   /* USE_ASSERT_CHECKING */
 
-extern int ExceptionalCondition(const char *conditionName,
+extern void ExceptionalCondition(const char *conditionName,
 					 const char *errorType,
-					 const char *fileName, int lineNumber);
+			 const char *fileName, int lineNumber) __attribute__((noreturn));
 
 //#define PGXC_COORD  // for PGXC coordinator compiling
 //#define PGXC_DATANODE // for PGXC data node compiling