Fix potential data corruption during freeze

feodor · feodor · commit b90e4ca3edfd · 2017-07-06T17:20:37.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
@@ -5929,7 +5929,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
`@@ -5929,7 +5929,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,`
`5929`	`5929`	`frz->t_infomask &= ~HEAP_XMAX_BITS;`
`5930`	`5930`	`frz->xmax = newxmax;`
`5931`	`5931`	`if (flags & FRM_MARK_COMMITTED)`
`5932`		`- frz->t_infomask &= HEAP_XMAX_COMMITTED;`
	`5932`	`+ frz->t_infomask \|= HEAP_XMAX_COMMITTED;`
`5933`	`5933`	`changed = true;`
`5934`	`5934`	`}`
`5935`	`5935`	`else if (flags & FRM_RETURN_IS_MULTI)`