mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
Removed not used ha_drop_table()
This was done after changing call in sql_select.cc from ha_drop_table() to drop_table(), like in 11.5
This commit is contained in:
parent
69be363daa
commit
93fb364cd9
3 changed files with 1 additions and 30 deletions
|
@ -553,13 +553,6 @@ static void update_discovery_counters(handlerton *hton, int val)
|
||||||
engines_with_discover+= val;
|
engines_with_discover+= val;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ha_drop_table(THD *thd, handlerton *hton, const char *path)
|
|
||||||
{
|
|
||||||
if (ha_check_if_updates_are_ignored(thd, hton, "DROP"))
|
|
||||||
return 0; // Simulate dropped
|
|
||||||
return hton->drop_table(hton, path);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int hton_drop_table(handlerton *hton, const char *path)
|
static int hton_drop_table(handlerton *hton, const char *path)
|
||||||
{
|
{
|
||||||
char tmp_path[FN_REFLEN];
|
char tmp_path[FN_REFLEN];
|
||||||
|
@ -5142,27 +5135,6 @@ handler::ha_rename_table(const char *from, const char *to)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
Drop table in the engine: public interface.
|
|
||||||
|
|
||||||
@sa handler::drop_table()
|
|
||||||
|
|
||||||
The difference between this and delete_table() is that the table is open in
|
|
||||||
drop_table().
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
handler::ha_drop_table(const char *name)
|
|
||||||
{
|
|
||||||
DBUG_ASSERT(m_lock_type == F_UNLCK);
|
|
||||||
if (check_if_updates_are_ignored("DROP"))
|
|
||||||
return;
|
|
||||||
|
|
||||||
mark_trx_read_write();
|
|
||||||
drop_table(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Structure used during force drop table.
|
Structure used during force drop table.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -3437,7 +3437,6 @@ public:
|
||||||
int ha_enable_indexes(key_map map, bool persist);
|
int ha_enable_indexes(key_map map, bool persist);
|
||||||
int ha_discard_or_import_tablespace(my_bool discard);
|
int ha_discard_or_import_tablespace(my_bool discard);
|
||||||
int ha_rename_table(const char *from, const char *to);
|
int ha_rename_table(const char *from, const char *to);
|
||||||
void ha_drop_table(const char *name);
|
|
||||||
|
|
||||||
int ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info);
|
int ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info);
|
||||||
|
|
||||||
|
|
|
@ -20564,7 +20564,7 @@ free_tmp_table(THD *thd, TABLE *entry)
|
||||||
thd->tmp_tables_size+= (entry->file->stats.data_file_length +
|
thd->tmp_tables_size+= (entry->file->stats.data_file_length +
|
||||||
entry->file->stats.index_file_length);
|
entry->file->stats.index_file_length);
|
||||||
}
|
}
|
||||||
entry->file->ha_drop_table(entry->s->path.str);
|
entry->file->drop_table(entry->s->path.str);
|
||||||
delete entry->file;
|
delete entry->file;
|
||||||
entry->file= NULL;
|
entry->file= NULL;
|
||||||
entry->reset_created();
|
entry->reset_created();
|
||||||
|
|
Loading…
Add table
Reference in a new issue