Fix potential data corruption during freeze

feodor · feodor · commit f371cc9e9fff · 2017-07-06T17:20:56.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
@@ -5737,7 +5737,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)

Original file line number	Diff line number	Diff line change
`@@ -5737,7 +5737,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,`
`5737`	`5737`	`frz->t_infomask &= ~HEAP_XMAX_BITS;`
`5738`	`5738`	`frz->xmax = newxmax;`
`5739`	`5739`	`if (flags & FRM_MARK_COMMITTED)`
`5740`		`- frz->t_infomask &= HEAP_XMAX_COMMITTED;`
	`5740`	`+ frz->t_infomask \|= HEAP_XMAX_COMMITTED;`
`5741`	`5741`	`changed = true;`
`5742`	`5742`	`}`
`5743`	`5743`	`else if (flags & FRM_RETURN_IS_MULTI)`