summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-25 18:10:31 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-25 18:10:31 +0200
commit8aa345d58f7c915ab9ad9154df8c7921d94efae1 (patch)
tree38dc885e41e58c4ef29176c18c92b60aa1bd85c8
parenta21037871ca7cf0dd8cecdeeaa6ae3b0f6e2580e (diff)
downloadmariadb-git-bb-10.6-MDEV-24973.tar.gz
fixup 522fd37c3e0a8d38d9796dceb349393f0e4b9e44bb-10.6-MDEV-24973
-rw-r--r--storage/innobase/lock/lock0lock.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index a9fbd61c6ca..7b177308268 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -1822,7 +1822,6 @@ end_wait:
mysql_mutex_lock(&lock_sys.wait_mutex);
if (lock_t *lock= trx->lock.wait_lock)
{
- ut_ad(lock == wait_lock);
trx->mutex_lock();
lock_cancel_waiting_and_release(lock);
trx->mutex_unlock();