mirror of
https://github.com/MariaDB/server.git
synced 2025-06-25 06:22:03 +03:00
merged
mysys/my_alloc.c: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -229,7 +229,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
|
||||
for (table= tables; table; table= table->next_local)
|
||||
{
|
||||
char *db=table->db;
|
||||
table->was_dropped= 0;
|
||||
mysql_ha_flush(thd, table, MYSQL_HA_CLOSE_FINAL);
|
||||
if (!close_temporary_table(thd, db, table->table_name))
|
||||
{
|
||||
@ -301,8 +300,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
|
||||
wrong_tables.append(',');
|
||||
wrong_tables.append(String(table->table_name,system_charset_info));
|
||||
}
|
||||
else
|
||||
table->was_dropped= 1;
|
||||
}
|
||||
thd->tmp_table_used= tmp_table_deleted;
|
||||
error= 0;
|
||||
|
Reference in New Issue
Block a user