refs codership/mysql-wsrep#184

Merge fix to XtraDB engine.

refs codership/mysql-wsrep#184
Merge fix to XtraDB engine.
c1ea0570 · Nirbhay Choubey · 251c53a8 · c1ea0570
Commit c1ea0570 authored Feb 22, 2016 by Nirbhay Choubey
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

storage/xtradb/lock/lock0wait.cc storage/xtradb/lock/lock0wait.cc +3 -2

No files found.
--- a/storage/xtradb/lock/lock0wait.cc
+++ b/storage/xtradb/lock/lock0wait.cc
@@ -394,8 +394,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) ||
-                    && trx->error_state != DB_DEADLOCK) {
+                    (!wsrep_is_BF_lock_timeout(trx) &&
+                     trx->error_state != DB_DEADLOCK)) {
 #endif /* WITH_WSREP */
 		trx->error_state = DB_LOCK_WAIT_TIMEOUT;