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, 0 insertions, 25 deletions

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 032982d30b..cf4d6e66e6 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -157,19 +157,6 @@ ifeq ($(PORTNAME), openbsd)
   endif
 endif
 
-ifeq ($(PORTNAME), bsdi)
-  ifeq ($(DLSUFFIX), .so)
-    LINK.shared		= $(COMPILER) -shared
-    ifdef soname
-      LINK.shared	+= -Wl,-x,-soname,$(soname)
-    endif
-    SHLIB_LINK		+= -lc
-  endif
-  ifeq ($(DLSUFFIX), .o)
-    LINK.shared		= shlicc -O $(LDREL)
-  endif
-endif
-
 ifeq ($(PORTNAME), freebsd)
   ifdef ELF_SYSTEM
     ifdef SO_MAJOR_VERSION
@@ -268,10 +255,6 @@ ifeq ($(PORTNAME), solaris)
   endif
 endif
 
-ifeq ($(PORTNAME), sunos4)
-  LINK.shared		= $(LD) -assert pure-text -Bdynamic
-endif
-
 ifeq ($(PORTNAME), osf)
   LINK.shared		= $(LD) -shared -expect_unresolved '*'
 endif
@@ -288,14 +271,6 @@ ifeq ($(PORTNAME), sco)
   endif
 endif
 
-ifeq ($(PORTNAME), svr4)
-  LINK.shared		= $(LD) -G
-endif
-
-ifeq ($(PORTNAME), univel)
-  LINK.shared		= $(LD) -G -z text
-endif
-
 ifeq ($(PORTNAME), unixware)
   ifeq ($(GCC), yes)
     LINK.shared		= $(CC) -shared