Commitdbac09d

committed

Merge branch 'master' into more_tests

2 parentsc820e3c +cab8515 commitdbac09dCopy full SHA for dbac09d

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2081,6 +2081,7 @@ static void MtmInitialize()`
`2081`	`2081`	`Mtm->nodes[i].originId=InvalidRepOriginId;`
`2082`	`2082`	`Mtm->nodes[i].timeline=0;`
`2083`	`2083`	`}`
	`2084`	`+Mtm->nodes[MtmNodeId-1].originId=DoNotReplicateId;`
`2084`	`2085`	`PGSemaphoreCreate(&Mtm->sendSemaphore);`
`2085`	`2086`	`PGSemaphoreReset(&Mtm->sendSemaphore);`
`2086`	`2087`	`SpinLockInit(&Mtm->spinlock);`
`@@ -2807,10 +2808,12 @@ void MtmFinishPreparedTransaction(MtmTransState* ts, bool commit)`
`2807`	`2808`	`Assert(!IsTransactionState());`
`2808`	`2809`	`MtmResetTransaction();`
`2809`	`2810`	`StartTransactionCommand();`
	`2811`	`+#if0`
`2810`	`2812`	`if (Mtm->nodes[MtmNodeId-1].originId==InvalidRepOriginId) {`
`2811`	`2813`	`/* This dummy origin is used for local commits/aborts which should not be replicated */`
`2812`	`2814`	`Mtm->nodes[MtmNodeId-1].originId=replorigin_create(psprintf(MULTIMASTER_SLOT_PATTERN,MtmNodeId));`
`2813`	`2815`	`}`
	`2816`	`+#endif`
`2814`	`2817`	`MtmBeginSession(MtmNodeId);`
`2815`	`2818`	`MtmSetCurrentTransactionCSN(ts->csn);`
`2816`	`2819`	`MtmSetCurrentTransactionGID(ts->gid);`

Lines changed: 2 additions & 2 deletions

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`	`}`

Comments

(0)