diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
| commit | 90e4f7f9d3f2669ac99f2817f884315bfc86b0a7 (patch) | |
| tree | 60a10a515a9f5656e797d8142f97b94f89f4e797 /sql/sql_alter.cc | |
| parent | 586fab72f01e1c7f0f8bf363fa6b06a2f10965b4 (diff) | |
| parent | 5b7cab82195268f7657504d0b53995654748cefa (diff) | |
| download | mariadb-git-90e4f7f9d3f2669ac99f2817f884315bfc86b0a7.tar.gz | |
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 86bc3bb4e54..e3282709cd6 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -356,19 +356,8 @@ bool Sql_cmd_discard_import_tablespace::execute(THD *thd) it is the case. TODO: this design is obsolete and will be removed. */ - int table_kind= check_if_log_table(table_list->db_length, table_list->db, - table_list->table_name_length, - table_list->table_name, false); - - if (table_kind) - { - /* Disable alter of enabled log tables */ - if (logger.is_log_table_enabled(table_kind)) - { - my_error(ER_BAD_LOG_STATEMENT, MYF(0), "ALTER"); - return true; - } - } + if (check_if_log_table(table_list, TRUE, "ALTER")) + return true; return mysql_discard_or_import_tablespace(thd, table_list, |