mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 00:24:30 +02:00
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
This commit is contained in:
parent
15c936e4b3
commit
cdc01e29d3
23 changed files with 213 additions and 243 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue