Always SnapshotResetXmin() during ClearTransaction()

Avoid corner cases during 2PC with 6bad580d9e678a0b604883e14d8401d469b06566

1 files changed, 7 insertions, 8 deletions

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index dff3d51ec3c..3d92494e0ba 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -1051,7 +1051,7 @@ AtSubAbort_Snapshot(int level)
  *		Snapshot manager's cleanup function for end of transaction
  */
 void
-AtEOXact_Snapshot(bool isCommit, bool isPrepare)
+AtEOXact_Snapshot(bool isCommit, bool resetXmin)
 {
 	/*
 	 * In transaction-snapshot mode we must release our privately-managed
@@ -1137,16 +1137,15 @@ AtEOXact_Snapshot(bool isCommit, bool isPrepare)
 	FirstSnapshotSet = false;
 
 	/*
-	 * During normal commit and abort processing, we call
-	 * ProcArrayEndTransaction() or ProcArrayClearTransaction() to
-	 * reset the PgXact->xmin. That call happens prior to the call to
-	 * AtEOXact_Snapshot(), so we need not touch xmin here at all,
-	 * accept when we are preparing a transaction.
+	 * During normal commit processing, we call
+	 * ProcArrayEndTransaction() to reset the PgXact->xmin. That call
+	 * happens prior to the call to AtEOXact_Snapshot(), so we need
+	 * not touch xmin here at all.
 	 */
-	if (isPrepare)
+	if (resetXmin)
 		SnapshotResetXmin();
 
-	Assert(isPrepare || MyPgXact->xmin == 0);
+	Assert(resetXmin || MyPgXact->xmin == 0);
 }