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

cleanup: make dd_frm_type to work as documented

Browse Source 
remove redundant argument, return all possible enum values
This commit is contained in:
Sergei Golubchik
2020-06-15 14:06:08 +02:00
parent 2bb5981c20
commit 35f566db8d
6 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sql/handler.cc
View File

@ -5837,27 +5837,28 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
{
char engine_buf[NAME_CHAR_LEN + 1];
LEX_CSTRING engine= { engine_buf, 0 };
Table_type type;
Table_type type= dd_frm_type(thd, path, &engine);
if ((type= dd_frm_type(thd, path, &engine, is_sequence)) ==
TABLE_TYPE_UNKNOWN)
{
DBUG_PRINT("exit", ("Does not exist"));
switch (type) {
case TABLE_TYPE_UNKNOWN:
DBUG_PRINT("exit", ("Exist, cannot be opened"));
DBUG_RETURN(true); // Frm exists
}
if (type != TABLE_TYPE_VIEW)
{
plugin_ref p= plugin_lock_by_name(thd, &engine,
MYSQL_STORAGE_ENGINE_PLUGIN);
*hton= p ? plugin_hton(p) : NULL;
if (*hton)
case TABLE_TYPE_VIEW:
*hton= view_pseudo_hton;
DBUG_PRINT("exit", ("Exist, view"));
DBUG_RETURN(true); // Frm exists
case TABLE_TYPE_SEQUENCE:
*is_sequence= true;
/* fall through */
case TABLE_TYPE_NORMAL:
{
// verify that the table really exists
exists= discover_existence(thd, p, &args);
plugin_ref p= plugin_lock_by_name(thd, &engine,
MYSQL_STORAGE_ENGINE_PLUGIN);
*hton= p ? plugin_hton(p) : NULL;
if (*hton) // verify that the table really exists
exists= discover_existence(thd, p, &args);
}
}
else
*hton= view_pseudo_hton;
}
DBUG_PRINT("exit", (exists ? "Exists" : "Does not exist"));
DBUG_RETURN(exists);