From 2c56142b770d9f8db24cc286ee768cc3edbfdd56 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Mon, 22 Feb 2016 16:36:05 -0500
Subject: [PATCH] refs codership/mysql-wsrep#184

Merge fix to XtraDB engine.
---
 storage/xtradb/lock/lock0wait.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/storage/xtradb/lock/lock0wait.cc b/storage/xtradb/lock/lock0wait.cc
index 579b95a5ebd..29dfffcd496 100644
--- 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;