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

Merge 10.0-galera into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-06 16:14:23 +01:00
parent f9448bcb21 7cda4bee0e
commit 8e7649867f
118 changed files with 6431 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -2820,8 +2820,6 @@ mysql_execute_command(THD *thd)
#endif
case SQLCOM_SHOW_STATUS:
{
if (WSREP_CLIENT(thd) && wsrep_sync_wait(thd))
goto error;
execute_show_status(thd, all_tables);
break;
}
@ -6965,7 +6963,7 @@ static void wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
WSREP_DEBUG("abort in exec query state, avoiding autocommit");
}
if (thd->wsrep_conflict_state== MUST_REPLAY)
if (thd->wsrep_conflict_state == MUST_REPLAY)
{
wsrep_replay_transaction(thd);
}