Commit ada3d758 authored by Jan Lindström's avatar Jan Lindström

MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lock

When we enter here wait_lock could be already gone i.e. NULL, that
should be allowed.
parent 8e5f532d
...@@ -779,7 +779,8 @@ lock_reset_lock_and_trx_wait( ...@@ -779,7 +779,8 @@ lock_reset_lock_and_trx_wait(
ut_ad(lock_get_wait(lock)); ut_ad(lock_get_wait(lock));
ut_ad(lock_mutex_own()); ut_ad(lock_mutex_own());
if (lock->trx->lock.wait_lock != lock) { if (lock->trx->lock.wait_lock &&
lock->trx->lock.wait_lock != lock) {
const char* stmt=NULL; const char* stmt=NULL;
const char* stmt2=NULL; const char* stmt2=NULL;
size_t stmt_len; size_t stmt_len;
...@@ -800,7 +801,7 @@ lock_reset_lock_and_trx_wait( ...@@ -800,7 +801,7 @@ lock_reset_lock_and_trx_wait(
<< " and statement " << " and statement "
<< (stmt2 ? stmt2 : "NULL") << (stmt2 ? stmt2 : "NULL")
<< "wait_lock " << lock->trx->lock.wait_lock; << "wait_lock " << lock->trx->lock.wait_lock;
ut_error; ut_ad(lock->trx->lock.wait_lock != lock);
} }
lock->trx->lock.wait_lock = NULL; lock->trx->lock.wait_lock = NULL;
......
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