database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

bzr merge -r4104..4120 codership/5.6/

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-08-12 14:05:44 -04:00
parent 38f048a013
commit 857abf1481
9 changed files with 158 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_admin.cc
View File

@ -1200,6 +1200,7 @@ bool Sql_cmd_optimize_table::execute(THD *thd)
if (check_table_access(thd, SELECT_ACL | INSERT_ACL, first_table,
FALSE, UINT_MAX, FALSE))
goto error; /* purecov: inspected */
WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL)
thd->enable_slow_log= opt_log_slow_admin_statements;
res= (specialflag & SPECIAL_NO_NEW_FUNC) ?
mysql_recreate_table(thd, first_table, true) :