Fix potential data corruption during freeze

feodor · feodor · commit 42f62e4c976e · 2017-07-06T17:19:44.000+03:00
Fix oversight in 3b97e68 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
@@ -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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -6653,7 +6653,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,`
`6653`	`6653`	`frz->t_infomask &= ~HEAP_XMAX_BITS;`
`6654`	`6654`	`frz->xmax = newxmax;`
`6655`	`6655`	`if (flags & FRM_MARK_COMMITTED)`
`6656`		`- frz->t_infomask &= HEAP_XMAX_COMMITTED;`
	`6656`	`+ frz->t_infomask \|= HEAP_XMAX_COMMITTED;`
`6657`	`6657`	`changed = true;`
`6658`	`6658`	`totally_frozen = false;`
`6659`	`6659`	`}`