diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2017-03-10 09:25:24 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-14 11:44:22 +0300 |
| commit | 795713405b0605caddf77f422a0414f1169487b9 (patch) | |
| tree | b94d73607539c57f625c77e8e7ccc4f6810ad8a1 /sql/wsrep_mysqld.cc | |
| parent | 3d4708554cde8f76219d1c25fce81e142737745d (diff) | |
| download | mariadb-git-795713405b0605caddf77f422a0414f1169487b9.tar.gz | |
Refs: MW-360 * fix for regression with galera_toi_ddl_nonconflicting test
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index dfae06b262d..6e847a33dfb 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -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_); |