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

Fix compiler error when WITH_WSREP is not used.

parent ab150128
...@@ -6063,16 +6063,15 @@ lock_rec_queue_validate( ...@@ -6063,16 +6063,15 @@ lock_rec_queue_validate(
if (!lock_rec_get_gap(lock) && !lock_get_wait(lock)) { if (!lock_rec_get_gap(lock) && !lock_get_wait(lock)) {
#ifndef WITH_WSREP #ifndef WITH_WSREP
if (wsrep_thd_is_wsrep(lock->trx->mysql_thd)) { enum lock_mode mode;
enum lock_mode mode;
if (lock_get_mode(lock) == LOCK_S) { if (lock_get_mode(lock) == LOCK_S) {
mode = LOCK_X; mode = LOCK_X;
} else { } else {
mode = LOCK_S; mode = LOCK_S;
} }
ut_a(!lock_rec_other_has_expl_req( ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx)); mode, 0, 0, block, heap_no, lock->trx));
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
......
...@@ -6112,17 +6112,16 @@ lock_rec_queue_validate( ...@@ -6112,17 +6112,16 @@ lock_rec_queue_validate(
if (!lock_rec_get_gap(lock) && !lock_get_wait(lock)) { if (!lock_rec_get_gap(lock) && !lock_get_wait(lock)) {
#ifndef WITH_WSREP #ifndef WITH_WSREP
if (wsrep_thd_is_wsrep(lock->trx->mysql_thd)) { enum lock_mode mode;
enum lock_mode mode;
if (lock_get_mode(lock) == LOCK_S) { if (lock_get_mode(lock) == LOCK_S) {
mode = LOCK_X; mode = LOCK_X;
} else { } else {
mode = LOCK_S; mode = LOCK_S;
} }
ut_a(!lock_rec_other_has_expl_req( ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx->id)); mode, 0, 0, block, heap_no, lock->trx->id));
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
......
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