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

1 files changed, 30 insertions, 29 deletions

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 3e52c073cc..21aa365162 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -1731,7 +1731,7 @@ numeric_abbrev_abort(int memtupcount, SortSupport ssup)
 		if (trace_sort)
 			elog(LOG,
 				 "numeric_abbrev: aborting abbreviation at cardinality %f"
-				 " below threshold %f after " INT64_FORMAT " values (%d rows)",
+			   " below threshold %f after " INT64_FORMAT " values (%d rows)",
 				 abbr_card, nss->input_count / 10000.0 + 0.5,
 				 nss->input_count, memtupcount);
 #endif
@@ -3625,10 +3625,10 @@ numeric_accum_inv(PG_FUNCTION_ARGS)
 #ifdef HAVE_INT128
 typedef struct Int128AggState
 {
-	bool	calcSumX2;	/* if true, calculate sumX2 */
-	int64	N;			/* count of processed numbers */
-	int128	sumX;		/* sum of processed numbers */
-	int128	sumX2;		/* sum of squares of processed numbers */
+	bool		calcSumX2;		/* if true, calculate sumX2 */
+	int64		N;				/* count of processed numbers */
+	int128		sumX;			/* sum of processed numbers */
+	int128		sumX2;			/* sum of squares of processed numbers */
 } Int128AggState;
 
 /*
@@ -3920,9 +3920,9 @@ Datum
 numeric_poly_sum(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	*state;
-	Numeric			res;
-	NumericVar		result;
+	PolyNumAggState *state;
+	Numeric		res;
+	NumericVar	result;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -3948,9 +3948,10 @@ Datum
 numeric_poly_avg(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	NumericVar			result;
-	Datum				countd, sumd;
+	PolyNumAggState *state;
+	NumericVar	result;
+	Datum		countd,
+				sumd;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4179,8 +4180,8 @@ numeric_stddev_pop(PG_FUNCTION_ARGS)
 #ifdef HAVE_INT128
 static Numeric
 numeric_poly_stddev_internal(Int128AggState *state,
-						bool variance, bool sample,
-						bool *is_null)
+							 bool variance, bool sample,
+							 bool *is_null)
 {
 	NumericAggState numstate;
 	Numeric		res;
@@ -4214,9 +4215,9 @@ Datum
 numeric_poly_var_samp(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4235,9 +4236,9 @@ Datum
 numeric_poly_stddev_samp(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4256,9 +4257,9 @@ Datum
 numeric_poly_var_pop(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -4277,9 +4278,9 @@ Datum
 numeric_poly_stddev_pop(PG_FUNCTION_ARGS)
 {
 #ifdef HAVE_INT128
-	PolyNumAggState	   *state;
-	Numeric				res;
-	bool				is_null;
+	PolyNumAggState *state;
+	Numeric		res;
+	bool		is_null;
 
 	state = PG_ARGISNULL(0) ? NULL : (PolyNumAggState *) PG_GETARG_POINTER(0);
 
@@ -5555,10 +5556,10 @@ int64_to_numericvar(int64 val, NumericVar *var)
 static void
 int128_to_numericvar(int128 val, NumericVar *var)
 {
-	uint128			uval,
-					newuval;
-	NumericDigit   *ptr;
-	int				ndigits;
+	uint128		uval,
+				newuval;
+	NumericDigit *ptr;
+	int			ndigits;
 
 	/* int128 can require at most 39 decimal digits; add one for safety */
 	alloc_var(var, 40 / DEC_DIGITS);