mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refs: MW-360 * fix for regression with galera_toi_ddl_nonconflicting test

Browse source
This commit is contained in:
sjaakola 2017-03-10 09:25:24 +02:00 • committed by Jan Lindström
commit 795713405b
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/wsrep_mysqld.cc
View file

@ -1324,7 +1324,7 @@ static bool wsrep_can_run_in_toi(THD *thd, const char *db, const char *table,
1: TOI replication was skipped
-1: TOI replication failed
*/
static int wsrep_TOI_begin(THD *thd, const char *query, char *db_, char *table_,
static int wsrep_TOI_begin(THD *thd, char *db_, char *table_,
const TABLE_LIST* table_list)
{
wsrep_status_t ret(WSREP_WARNING);
@ -1366,8 +1366,7 @@ static int wsrep_TOI_begin(THD *thd, const char *query, char *db_, char *table_,
}
/* fallthrough */
default:
buf_err= wsrep_to_buf_helper(thd, (query) ? query : thd->query(),
(query) ? strlen(query) : thd->query_length(),
buf_err= wsrep_to_buf_helper(thd, thd->query(), thd->query_length(),
&buf, &buf_len);
break;
}
@ -1573,7 +1572,7 @@ int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
{
switch (thd->variables.wsrep_OSU_method) {
case WSREP_OSU_TOI:
ret = wsrep_TOI_begin(thd, thd->query(), db_, table_, table_list);
ret = wsrep_TOI_begin(thd, db_, table_, table_list);
break;
case WSREP_OSU_RSU:
ret = wsrep_RSU_begin(thd, db_, table_);