Commit 1bba40f0 authored by Jan Lindström's avatar Jan Lindström

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.
parent fc179878
...@@ -798,7 +798,6 @@ lock_reset_lock_and_trx_wait( ...@@ -798,7 +798,6 @@ lock_reset_lock_and_trx_wait(
/* Reset the back pointer in trx to this waiting lock request */ /* Reset the back pointer in trx to this waiting lock request */
if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) { if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
ut_ad((lock->trx)->wait_lock == lock);
(lock->trx)->wait_lock = NULL; (lock->trx)->wait_lock = NULL;
} else { } else {
ut_ad(lock_get_type_low(lock) == LOCK_REC); ut_ad(lock_get_type_low(lock) == LOCK_REC);
......
...@@ -799,7 +799,6 @@ lock_reset_lock_and_trx_wait( ...@@ -799,7 +799,6 @@ lock_reset_lock_and_trx_wait(
/* Reset the back pointer in trx to this waiting lock request */ /* Reset the back pointer in trx to this waiting lock request */
if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) { if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) {
ut_ad((lock->trx)->wait_lock == lock);
(lock->trx)->wait_lock = NULL; (lock->trx)->wait_lock = NULL;
} else { } else {
ut_ad(lock_get_type_low(lock) == LOCK_REC); ut_ad(lock_get_type_low(lock) == LOCK_REC);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment