diff options
Diffstat (limited to 'storage/innobase/lock/lock0lock.cc')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 3edb8a3454e..7cf73553c24 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -2556,11 +2556,12 @@ lock_rec_lock_slow( } else { +#ifdef WITH_WSREP if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS && wsrep_on_trx(trx)) { innodb_lock_schedule_algorithm = INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS; } - +#endif const lock_t* wait_for = lock_rec_other_has_conflicting( mode, block, heap_no, trx); @@ -4808,10 +4809,12 @@ lock_table( /* We have to check if the new lock is compatible with any locks other transactions have in the table lock queue. */ +#ifdef WITH_WSREP if (innodb_lock_schedule_algorithm == INNODB_LOCK_SCHEDULE_ALGORITHM_VATS && wsrep_on_trx(trx)) { innodb_lock_schedule_algorithm = INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS; } +#endif wait_for = lock_table_other_has_incompatible( trx, LOCK_WAIT, table, mode); |