refs codership/mysql-wsrep#184

Merge fix to XtraDB engine.

refs codership/mysql-wsrep#184
Merge fix to XtraDB engine.
2c56142b · Nirbhay Choubey · 1d216768 · 2c56142b
Commit 2c56142b authored Feb 22, 2016 by Nirbhay Choubey
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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