diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:01:13 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:01:13 +0300 |
| commit | 0a9216835f406947fb4d492616da4cda75e5e113 (patch) | |
| tree | 7fbf5059c59fa86ca255452f3ce312aece492652 /sql/sql_admin.cc | |
| parent | 58926b5e1990d3245b55081ba511fbabe2604e17 (diff) | |
| download | mariadb-git-0a9216835f406947fb4d492616da4cda75e5e113.tar.gz | |
Initial merge result with mariaDB 10: lp:maria
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 9e3ea46f526..a9b7624af3c 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1153,6 +1153,8 @@ bool Optimize_table_statement::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_SAFE_MODE | SPECIAL_NO_NEW_FUNC)) ? mysql_recreate_table(thd, first_table) : mysql_admin_table(thd, first_table, &m_lex->check_opt, @@ -1184,6 +1186,7 @@ bool Repair_table_statement::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= mysql_admin_table(thd, first_table, &m_lex->check_opt, "repair", TL_WRITE, 1, test(m_lex->check_opt.sql_flags & TT_USEFRM), |