database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API #24

Browse Source
This commit is contained in:
Seppo Jaakola
2013-11-26 16:48:30 +02:00
parent 2b4183f10b
commit a2594e96f7
28 changed files with 1099 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -953,7 +953,6 @@ bool do_command(THD *thd)
else if (thd->wsrep_conflict_state == ABORTED)
{
thd->store_globals();
thd->wsrep_bf_thd = NULL;
}
thd->wsrep_query_state= QUERY_EXEC;
@ -1241,7 +1240,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->mysys_var->abort = 0;
thd->wsrep_conflict_state = NO_CONFLICT;
thd->wsrep_retry_counter = 0;
thd->wsrep_bf_thd = NULL;
/*
Increment threads running to compensate dec_thread_running() called
after dispatch_end label.