database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

References lp:1051808 lp:1049024 https://mariadb.atlassian.net/browse/MDEV-541

Browse Source 
patched with: bzr diff lp:codership-mysql/5.5 -r3794..3795
This commit is contained in:
Seppo Jaakola
2012-09-20 09:35:22 +03:00
parent 6475ef7db3
commit 20df56c100
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -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);