Manual merge

parent 4e8f8a01
...@@ -1558,9 +1558,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, ...@@ -1558,9 +1558,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
/* Don't give warnings for not found errors, as we already generate notes */ /* Don't give warnings for not found errors, as we already generate notes */
thd->no_warnings_for_error= 1; thd->no_warnings_for_error= 1;
/* Remove the tables from the HANDLER list, if they are in it. */
mysql_ha_flush(thd, tables, MYSQL_HA_CLOSE_FINAL, 1);
for (table= tables; table; table= table->next_local) for (table= tables; table; table= table->next_local)
{ {
char *db=table->db; char *db=table->db;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment