diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /sql/sql_admin.cc | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 9f92af61eec..d0d959de8f9 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1325,6 +1325,9 @@ bool Sql_cmd_analyze_table::execute(THD *thd) m_lex->query_tables= first_table; error: +#ifdef WITH_WSREP +wsrep_error_label: +#endif DBUG_RETURN(res); } @@ -1382,6 +1385,9 @@ bool Sql_cmd_optimize_table::execute(THD *thd) m_lex->query_tables= first_table; error: +#ifdef WITH_WSREP +wsrep_error_label: +#endif DBUG_RETURN(res); } @@ -1417,5 +1423,8 @@ bool Sql_cmd_repair_table::execute(THD *thd) m_lex->query_tables= first_table; error: +#ifdef WITH_WSREP +wsrep_error_label: +#endif DBUG_RETURN(res); } |