diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:50:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:50:30 +0200 |
| commit | cdc01e29d3a9f6d98aaa482363af81003485e256 (patch) | |
| tree | 20c8ce171e2666e720ac5977561997038fe3c2f2 /sql/sql_base.cc | |
| parent | 15c936e4b3d151346c027bd4b51b44c826b095b6 (diff) | |
| download | mariadb-git-cdc01e29d3a9f6d98aaa482363af81003485e256.tar.gz | |
remove dd_frm_type(), dd_frm_storage_engine(), dd_check_storage_engine_flag()
from everywhere - now RENAME, SHOW FULL TABLES, and TRUNCATE work with discovery.
improve error messages in truncate
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index d93c412dd60..c4e510fd451 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -55,7 +55,7 @@ #include <hash.h> #include "rpl_filter.h" #include "sql_table.h" // build_table_filename -#include "datadict.h" // dd_frm_type() +#include "datadict.h" // dd_frm_is_view() #include "sql_hset.h" // Hash_set #ifdef __WIN__ #include <io.h> @@ -2774,7 +2774,6 @@ bool open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, MDL_SHARED)) { char path[FN_REFLEN + 1]; - enum legacy_db_type not_used; build_table_filename(path, sizeof(path) - 1, table_list->db, table_list->table_name, reg_ext, 0); /* @@ -2784,7 +2783,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, during prelocking process (in this case in theory we still should hold shared metadata lock on it). */ - if (dd_frm_type(thd, path, ¬_used) == FRMTYPE_VIEW) + if (dd_frm_is_view(thd, path)) { if (!tdc_open_view(thd, table_list, alias, key, key_length, mem_root, 0)) |