Skip to content

Commit 1bba40f

Browse files
author
Jan Lindström
committed
MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lock
In Galera case this assertion is too strict as conflicting lock could be same as lock here.
1 parent fc17987 commit 1bba40f

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

storage/innobase/lock/lock0lock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,6 @@ lock_reset_lock_and_trx_wait(
798798
/* Reset the back pointer in trx to this waiting lock request */
799799

800800
if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
801-
ut_ad((lock->trx)->wait_lock == lock);
802801
(lock->trx)->wait_lock = NULL;
803802
} else {
804803
ut_ad(lock_get_type_low(lock) == LOCK_REC);

storage/xtradb/lock/lock0lock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,6 @@ lock_reset_lock_and_trx_wait(
799799
/* Reset the back pointer in trx to this waiting lock request */
800800

801801
if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
802-
ut_ad((lock->trx)->wait_lock == lock);
803802
(lock->trx)->wait_lock = NULL;
804803
} else {
805804
ut_ad(lock_get_type_low(lock) == LOCK_REC);

0 commit comments

Comments
 (0)