Merge remote-tracking branch 'remotes/PGSQL/master' into XL_NEW_MASTER

Conflicts:
	.gitignore
	contrib/Makefile
	src/backend/access/common/heaptuple.c
	src/backend/access/transam/rmgr.c
	src/backend/access/transam/xact.c
	src/backend/catalog/Makefile
	src/backend/catalog/catalog.c
	src/backend/catalog/genbki.pl
	src/backend/catalog/namespace.c
	src/backend/commands/sequence.c
	src/backend/executor/execMain.c
	src/backend/executor/functions.c
	src/backend/executor/nodeAgg.c
	src/backend/executor/nodeModifyTable.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/outfuncs.c
	src/backend/nodes/readfuncs.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/planner.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/optimizer/util/pathnode.c
	src/backend/parser/gram.y
	src/backend/parser/parse_agg.c
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/postmaster.c
	src/backend/replication/logical/decode.c
	src/backend/storage/file/fd.c
	src/backend/storage/ipc/procsignal.c
	src/backend/tcop/utility.c
	src/backend/utils/adt/lockfuncs.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/sort/tuplesort.c
	src/backend/utils/time/snapmgr.c
	src/include/access/rmgrlist.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_proc.h
	src/include/nodes/execnodes.h
	src/include/nodes/plannodes.h
	src/include/nodes/primnodes.h
	src/include/nodes/relation.h
	src/include/storage/lwlock.h
	src/include/storage/procsignal.h
	src/include/utils/plancache.h
	src/include/utils/snapshot.h
	src/test/regress/expected/foreign_key.out
	src/test/regress/expected/triggers.out
	src/test/regress/expected/with.out
	src/test/regress/input/constraints.source
	src/test/regress/output/constraints.source
	src/test/regress/pg_regress.c
	src/test/regress/serial_schedule
	src/test/regress/sql/returning.sql

Author: pavanvd

.gitignore

@@ -40,4 +40,4 @@ lib*.pc
 /StormDB*
 /cscope*
 /.gitignore
-
+/tmp_install/

GNUmakefile.in

@@ -47,6 +47,7 @@ $(call recurse,distprep,doc-xc src config contrib)
 # it's not built by default
 $(call recurse,clean,doc-xc contrib src config)
 clean:
+	rm -rf tmp_install/
 # Garbage from autoconf:
 	@rm -rf autom4te.cache/
 
@@ -57,11 +58,10 @@ distclean maintainer-clean:
 	$(MAKE) -C contrib $@
 	$(MAKE) -C config $@
 	$(MAKE) -C src $@
-	rm -f config.cache config.log config.status GNUmakefile
+	rm -rf tmp_install/
 # Garbage from autoconf:
 	@rm -rf autom4te.cache/
-
-check check-tests: all
+	rm -f config.cache config.log config.status GNUmakefile
 
 check check-tests installcheck installcheck-parallel installcheck-tests:
 	$(MAKE) -C src/test/regress $@