Merge branch 'master' into more_tests

kelvich · kelvich · commit dbac09ddd230 · 2016-10-28T13:04:00.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2081,6 +2081,7 @@ static void MtmInitialize()
 			Mtm->nodes[i].originId = InvalidRepOriginId;
 			Mtm->nodes[i].timeline = 0;
 		}
+		Mtm->nodes[MtmNodeId-1].originId = DoNotReplicateId;
 		PGSemaphoreCreate(&Mtm->sendSemaphore);
 		PGSemaphoreReset(&Mtm->sendSemaphore);
 		SpinLockInit(&Mtm->spinlock);
@@ -2807,10 +2808,12 @@ void MtmFinishPreparedTransaction(MtmTransState* ts, bool commit)
 	Assert(!IsTransactionState());
 	MtmResetTransaction();
 	StartTransactionCommand();
+#if 0
 	if (Mtm->nodes[MtmNodeId-1].originId == InvalidRepOriginId) { 
 		/* This dummy origin is used for local commits/aborts which should not be replicated */
 		Mtm->nodes[MtmNodeId-1].originId = replorigin_create(psprintf(MULTIMASTER_SLOT_PATTERN, MtmNodeId));
 	}
+#endif
 	MtmBeginSession(MtmNodeId);
 	MtmSetCurrentTransactionCSN(ts->csn);
 	MtmSetCurrentTransactionGID(ts->gid);
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1067,10 +1067,10 @@ EndPrepare(GlobalTransaction gxact)
 	START_CRIT_SECTION();
 	xl_xinfo.xinfo = 0;
 	/* dump transaction origin information */
-	if (replorigin_session_origin != InvalidRepOriginId)
+	if (replorigin)
 	{
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
-		Assert(replorigin_session_origin_lsn != 0);
+		Assert(replorigin_session_origin_lsn != InvalidXLogRecPtr);
 		xl_origin.origin_lsn = replorigin_session_origin_lsn;
 		xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1067,10 +1067,10 @@ EndPrepare(GlobalTransaction gxact)`
`1067`	`1067`	`START_CRIT_SECTION();`
`1068`	`1068`	`xl_xinfo.xinfo = 0;`
`1069`	`1069`	`/* dump transaction origin information */`
`1070`		`- if (replorigin_session_origin != InvalidRepOriginId)`
	`1070`	`+ if (replorigin)`
`1071`	`1071`	`{`
`1072`	`1072`	`xl_xinfo.xinfo \|= XACT_XINFO_HAS_ORIGIN;`
`1073`		`- Assert(replorigin_session_origin_lsn != 0);`
	`1073`	`+ Assert(replorigin_session_origin_lsn != InvalidXLogRecPtr);`
`1074`	`1074`	`xl_origin.origin_lsn = replorigin_session_origin_lsn;`
`1075`	`1075`	`xl_origin.origin_timestamp = replorigin_session_origin_timestamp;`
`1076`	`1076`	`}`