From 91caf130b71ac7532b5f1a387b7cf506ea2b09e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 4 Aug 2020 09:56:09 +0300 Subject: MDEV-23101 fixup: Remove redundant code lock_rec_has_to_wait_in_queue(): Remove an obviously redundant assertion that was added in commit a8ec45863b958757da61af3b2ce0a38b0a79d92c and also enclose a Galera-specific condition in #ifdef WITH_WSREP. --- storage/innobase/lock/lock0lock.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 1e7d9b031d7..4730ae53133 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -2203,10 +2203,11 @@ lock_rec_has_to_wait_in_queue( hash = lock_hash_get(wait_lock->type_mode); for (lock = lock_rec_get_first_on_page_addr(hash, space, page_no); - lock && lock != wait_lock; +#ifdef WITH_WSREP + lock && +#endif + lock != wait_lock; lock = lock_rec_get_next_on_page_const(lock)) { - - ut_ad(lock); const byte* p = (const byte*) &lock[1]; if (heap_no < lock_rec_get_n_bits(lock) -- cgit v1.2.1