Skip to content
Permalink
Browse files
MDEV-23101 fixup: Remove redundant code
lock_rec_has_to_wait_in_queue(): Remove an obviously redundant assertion
that was added in commit a8ec458
and also enclose a Galera-specific condition in #ifdef WITH_WSREP.
  • Loading branch information
dr-m committed Aug 4, 2020
1 parent 5fb07d2 commit 91caf13
Showing 1 changed file with 4 additions and 3 deletions.
@@ -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)

0 comments on commit 91caf13

Please sign in to comment.