diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-25 10:42:05 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-25 10:42:05 +0300 |
| commit | 745239fd29d88ead433dddf39e4b369776efe62b (patch) | |
| tree | 9004d36cbc7a71bdf1b8e30f6df8adfba7941dec /sql/sql_admin.cc | |
| parent | 9c85ced30dc4f6d28b4fe7ad1b73ca76f3c43a44 (diff) | |
| download | mariadb-git-745239fd29d88ead433dddf39e4b369776efe62b.tar.gz | |
After merge fixes
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index b517c3b2d4d..34200d46ea2 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1116,6 +1116,9 @@ bool Sql_cmd_analyze_table::execute(THD *thd) FALSE, UINT_MAX, FALSE)) goto error; thd->enable_slow_log= opt_log_slow_admin_statements; +#ifdef WITH_WSREP + WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL); +#endif res= mysql_admin_table(thd, first_table, &m_lex->check_opt, "analyze", lock_type, 1, 0, 0, 0, &handler::ha_analyze, 0); @@ -1171,7 +1174,6 @@ bool Sql_cmd_optimize_table::execute(THD *thd) FALSE, UINT_MAX, FALSE)) goto error; /* purecov: inspected */ thd->enable_slow_log= opt_log_slow_admin_statements; - WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL) res= (specialflag & SPECIAL_NO_NEW_FUNC) ? mysql_recreate_table(thd, first_table) : |