diff options
| -rw-r--r-- | src/backend/access/heap/heapam.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index f8bed196926..6861ae0a7f2 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -5518,8 +5518,14 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask, * was a locker only, it can be removed without any further * consideration; but if it contained an update, we might need to * preserve it. + * + * Don't assert MultiXactIdIsRunning if the multi came from a + * pg_upgrade'd share-locked tuple, though, as doing that causes an + * error to be raised unnecessarily. */ - Assert(!MultiXactIdIsRunning(multi)); + Assert((!(t_infomask & HEAP_LOCK_MASK) && + HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)) || + !MultiXactIdIsRunning(multi)); if (HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)) { *flags |= FRM_INVALIDATE_XMAX; |