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.
MariaDB · Nov 9, 2016 · 1bba40f · 1bba40f
1 parent fc17987
commit 1bba40f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
@@ -798,7 +798,6 @@ lock_reset_lock_and_trx_wait(
 	/* Reset the back pointer in trx to this waiting lock request */
 
 	if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
-		ut_ad((lock->trx)->wait_lock == lock);
 		(lock->trx)->wait_lock = NULL;
 	} else {
 		ut_ad(lock_get_type_low(lock) == LOCK_REC);

diff --git a/storage/xtradb/lock/lock0lock.c b/storage/xtradb/lock/lock0lock.c
@@ -799,7 +799,6 @@ lock_reset_lock_and_trx_wait(
 	/* Reset the back pointer in trx to this waiting lock request */
 
 	if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
-		ut_ad((lock->trx)->wait_lock == lock);
 		(lock->trx)->wait_lock = NULL;
 	} else {
 		ut_ad(lock_get_type_low(lock) == LOCK_REC);