diff options
Diffstat (limited to 'src/backend/access/heap/heapam.c')
| -rw-r--r-- | src/backend/access/heap/heapam.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 2c74de9921b..9918c226c28 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -5924,6 +5924,7 @@ DoesMultiXactIdConflict(MultiXactId multi, uint16 infomask, int nmembers; MultiXactMember *members; bool result = false; + LOCKMODE wanted = tupleLockExtraInfo[lockmode].hwlock; allow_old = !(infomask & HEAP_LOCK_MASK) && HEAP_XMAX_IS_LOCKED_ONLY(infomask); nmembers = GetMultiXactIdMembers(multi, &members, allow_old); @@ -5934,11 +5935,12 @@ DoesMultiXactIdConflict(MultiXactId multi, uint16 infomask, for (i = 0; i < nmembers; i++) { TransactionId memxid; - LockTupleMode memlockmode; + LOCKMODE memlockmode; memlockmode = LOCKMODE_from_mxstatus(members[i].status); + /* ignore members that don't conflict with the lock we want */ - if (!DoLockModesConflict(memlockmode, lockmode)) + if (!DoLockModesConflict(memlockmode, wanted)) continue; /* ignore members from current xact */ |