From: Simon Riggs <simon@2ndQuadrant.com>
Date: Sat, 27 Jun 2015 01:22:12 +0000 (+0100)
Subject: Revoke incorrectly applied patch version
X-Git-Tag: REL9_2_14~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d22ba6b4065f493935f03bc28658744ae0a94c1;p=thirdparty%2Fpostgresql.git

Revoke incorrectly applied patch version
---

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 44ef948f504..2a494f59f4c 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -4725,13 +4725,7 @@ heap_xlog_freeze(XLogRecPtr lsn, XLogRecord *record)
 	 * consider the frozen xids as running.
 	 */
 	if (InHotStandby)
-	{
-		TransactionId latestRemovedXid = cutoff_xid;
-
-		TransactionIdRetreat(latestRemovedXid);
-
-		ResolveRecoveryConflictWithSnapshot(latestRemovedXid, rnode);
-	}
+		ResolveRecoveryConflictWithSnapshot(cutoff_xid, xlrec->node);
 
 	/* If we have a full-page image, restore it and we're done */
 	if (record->xl_info & XLR_BKP_BLOCK(0))