From: Teodor Sigaev <teodor@sigaev.ru>
Date: Thu, 6 Jul 2017 14:19:44 +0000 (+0300)
Subject: Fix potential data corruption during freeze
X-Git-Tag: REL9_6_4~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42f62e4c976e1cf90f5e5a6381c4ee656260f230;p=postgresql

Fix potential data corruption during freeze

Fix oversight in 3b97e6823b94 bug fix. Bitwise AND is used instead of OR and
it cleans all bits in t_infomask heap tuple field.

Backpatch to 9.3
---

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index b019bc1a0d..dc93b1e881 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -6653,7 +6653,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 			frz->t_infomask &= ~HEAP_XMAX_BITS;
 			frz->xmax = newxmax;
 			if (flags & FRM_MARK_COMMITTED)
-				frz->t_infomask &= HEAP_XMAX_COMMITTED;
+				frz->t_infomask |= HEAP_XMAX_COMMITTED;
 			changed = true;
 			totally_frozen = false;
 		}