From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 19 May 2014 14:26:01 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into csn
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=9d9fdefa42e3bb2be4e5b3f82107d7c285fbb06b;p=users%2Fheikki%2Fpostgres.git

Merge remote-tracking branch 'origin/master' into csn

Conflicts:
	src/backend/utils/adt/txid.c
	src/test/regress/expected/txid.out
	src/test/regress/sql/txid.sql
---

9d9fdefa42e3bb2be4e5b3f82107d7c285fbb06b
diff --cc src/backend/utils/adt/txid.c
index 568e02c972,7969a3353c..6ffa9c288e
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@@ -364,9 -517,11 +371,11 @@@ txid_snapshot_recv(PG_FUNCTION_ARGS
  		snap->xip[i] = cur;
  		last = cur;
  	}
+ 	snap->nxip = nxip;
+ 	SET_VARSIZE(snap, TXID_SNAPSHOT_SIZE(nxip));
  	PG_RETURN_POINTER(snap);
 -
  bad_format:
 +#endif
  	elog(ERROR, "invalid snapshot data");
  	return (Datum) NULL;
  }
diff --cc src/test/regress/sql/txid.sql
index b5c50b1d58,b6650b922e..b3809b0cfa
--- a/src/test/regress/sql/txid.sql
+++ b/src/test/regress/sql/txid.sql
@@@ -43,4 -52,3 +43,4 @@@ select txid_visible_in_snapshot('100010
  -- test 64bit overflow
  SELECT txid_snapshot '1:9223372036854775807:3';
  SELECT txid_snapshot '1:9223372036854775808:3';
- */
++*/