Merge branch 'xtm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into xtm

kelvich · kelvich · commit a27166e8d23b · 2015-09-25T14:04:17.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -482,7 +482,7 @@ DtmGetNewTransactionId(bool isSubXact)
 
 static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
-	if (TransactionIdIsValid(DtmNextXid) && IsMVCCSnapshot(snapshot) && snapshot != &CatalogSnapshotData) { 
+	if (TransactionIdIsValid(DtmNextXid) /*&& IsMVCCSnapshot(snapshot)*/ && snapshot != &CatalogSnapshotData) { 
 		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != snapshot->curcid)) {
 			DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &DtmMinXid);
 		}

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ DtmGetNewTransactionId(bool isSubXact)`
`482`	`482`
`483`	`483`	`static Snapshot DtmGetSnapshot(Snapshot snapshot)`
`484`	`484`	`{`
`485`		`- if (TransactionIdIsValid(DtmNextXid) && IsMVCCSnapshot(snapshot) && snapshot != &CatalogSnapshotData) {`
	`485`	`+ if (TransactionIdIsValid(DtmNextXid) /&& IsMVCCSnapshot(snapshot)/ && snapshot != &CatalogSnapshotData) {`
`486`	`486`	`if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot \|\| DtmCurcid != snapshot->curcid)) {`
`487`	`487`	`DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &DtmMinXid);`
`488`	`488`	`}`