diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-11-29 13:04:44 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-11-29 13:04:44 +0200 |
| commit | 8a2d669b1511356bfd3a39242afa7d9b6132a4a3 (patch) | |
| tree | ccecb7317163cceb1820ac8e473e91d33d771bb6 | |
| parent | c82f37361a3d2496cc03789a6fae75e016a53ce1 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-12837.tar.gz | |
Fix compiler error when WITH_WSREP is not defined.bb-10.2-MDEV-12837
| -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); |