Revoke incorrectly applied patch version

simonat2ndQuadrant · simonat2ndQuadrant · commit 2cb58109560d · 2015-06-27T02:22:45.000+01:00
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -4239,13 +4239,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))
