diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:46:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:46:58 +0200 |
| commit | 9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157 (patch) | |
| tree | 8c12732d7d80790d1f70ed5e302398600b733186 /sql/sql_alter.cc | |
| parent | 74d648db12e100c628548fb2e5aa67de718bd1fb (diff) | |
| parent | 91e4f00389483d22fa81517bbcdcd21499fd283a (diff) | |
| download | mariadb-git-9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index f76c4046ee0..23522795cdc 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -303,8 +303,6 @@ bool Sql_cmd_alter_table::execute(THD *thd) "INDEX DIRECTORY"); create_info.data_file_name= create_info.index_file_name= NULL; - thd->enable_slow_log= opt_log_slow_admin_statements; - #ifdef WITH_WSREP if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() || @@ -351,8 +349,6 @@ bool Sql_cmd_discard_import_tablespace::execute(THD *thd) if (check_grant(thd, ALTER_ACL, table_list, false, UINT_MAX, false)) return true; - thd->enable_slow_log= opt_log_slow_admin_statements; - /* Check if we attempt to alter mysql.slow_log or mysql.general_log table and return an error if |