Commit 91caf130 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-23101 fixup: Remove redundant code

lock_rec_has_to_wait_in_queue(): Remove an obviously redundant assertion
that was added in commit a8ec4586
and also enclose a Galera-specific condition in #ifdef WITH_WSREP.
parent 5fb07d22
...@@ -2203,10 +2203,11 @@ lock_rec_has_to_wait_in_queue( ...@@ -2203,10 +2203,11 @@ lock_rec_has_to_wait_in_queue(
hash = lock_hash_get(wait_lock->type_mode); hash = lock_hash_get(wait_lock->type_mode);
for (lock = lock_rec_get_first_on_page_addr(hash, space, page_no); 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)) { lock = lock_rec_get_next_on_page_const(lock)) {
ut_ad(lock);
const byte* p = (const byte*) &lock[1]; const byte* p = (const byte*) &lock[1];
if (heap_no < lock_rec_get_n_bits(lock) if (heap_no < lock_rec_get_n_bits(lock)
......
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