database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-17726: A better fix

Browse Source 
THD::close_temporary_tables(): Revert the change.

ha_innobase::delete_table(): Move the work-around inside
a debug assertion, and check thd_kill_level() instead of thd_killed(),
because the latter would not hold for KILL_CONNECTION.
This commit is contained in:
Marko Mäkelä
2018-11-16 10:36:57 +02:00
parent 705abdebaf
commit ab812c1089
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/temporary_tables.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2016,2018 MariaDB Corporation
Copyright (c) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -476,7 +476,6 @@ bool THD::close_temporary_tables()
}
DBUG_ASSERT(!rgi_slave);
lex->sql_command = SQLCOM_DROP_TABLE;
/*
Ensure we don't have open HANDLERs for tables we are about to close.