From 20df56c1002e809daa68fa7431a9dd7e3d899642 Mon Sep 17 00:00:00 2001 From: Seppo Jaakola Date: Thu, 20 Sep 2012 09:35:22 +0300 Subject: [PATCH] References lp:1051808 lp:1049024 https://mariadb.atlassian.net/browse/MDEV-541 patched with: bzr diff lp:codership-mysql/5.5 -r3794..3795 --- sql/sql_parse.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bbe74aa9f68..c008870b1df 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1056,8 +1056,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd, my_error(ER_LOCK_DEADLOCK, MYF(0), "wsrep aborted transaction"); WSREP_DEBUG("Deadlock error for: %s", thd->query()); mysql_mutex_unlock(&thd->LOCK_wsrep_thd); - thd->killed= NOT_KILLED; - thd->mysys_var->abort= 0; + thd->killed = NOT_KILLED; + thd->mysys_var->abort = 0; + thd->wsrep_conflict_state = NO_CONFLICT; + thd->wsrep_retry_counter = 0; + goto dispatch_end; } mysql_mutex_unlock(&thd->LOCK_wsrep_thd);