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 0e268f16af281bb2f93ea7489597f69621f4f248..3e1399e74e6cfed41c96f53f93ff9df3acae987f 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -6313,7 +6313,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;
        }
        else if (flags & FRM_RETURN_IS_MULTI)