diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-24 01:21:40 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-24 01:21:40 -0500 |
| commit | cceec7858f260be23b50265fb026ea68c6aefc20 (patch) | |
| tree | 52251df59c4a69527435c8d682505537fb6e9692 /storage/xtradb/lock | |
| parent | 88576b3a805f97be44d98143b6cdfc9b820fcc84 (diff) | |
| parent | f67d6fccacfb8a2963f23448cabb67c6178d2a10 (diff) | |
| download | mariadb-git-cceec7858f260be23b50265fb026ea68c6aefc20.tar.gz | |
Merge branch '10.0-galera' into bb-10.1-serg
Diffstat (limited to 'storage/xtradb/lock')
| -rw-r--r-- | storage/xtradb/lock/lock0wait.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/xtradb/lock/lock0wait.cc b/storage/xtradb/lock/lock0wait.cc index 2482c88d3b7..a87adcf94c0 100644 --- a/storage/xtradb/lock/lock0wait.cc +++ b/storage/xtradb/lock/lock0wait.cc @@ -396,7 +396,9 @@ lock_wait_suspend_thread( if (lock_wait_timeout < 100000000 && wait_time > (double) lock_wait_timeout) { #ifdef WITH_WSREP - if (!wsrep_is_BF_lock_timeout(trx)) { + if (!wsrep_on(trx->mysql_thd) || + (!wsrep_is_BF_lock_timeout(trx) && + trx->error_state != DB_DEADLOCK)) { #endif /* WITH_WSREP */ trx->error_state = DB_LOCK_WAIT_TIMEOUT; |