1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements

Browse Source 
If mysql_lock_tables fails because the lock was aborted, we need to
reset thd->some_tables_delete, otherwise we might loop indefinitely
because handler's tables are not closed in a standard way, meaning
that close_thread_tables() (which resets some_tables_deleted) is not
used.

This patch fixes sporadical failures of handler_myisam/innodb tests
which were introduced by previous fix for this bug.
This commit is contained in:
davi@moksha.com.br 2007-10-12 10:55:46 -03:00
parent c3d06676f8
commit b92f3309f1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_handler.cc
View File

@ -466,6 +466,12 @@ retry:
{ {
mysql_ha_close_table(thd, tables); mysql_ha_close_table(thd, tables);
hash_tables->table= NULL; hash_tables->table= NULL;
/*
The lock might have been aborted, we need to manually reset
thd->some_tables_deleted because handler's tables are closed
in a non-standard way. Otherwise we might loop indefinitely.
*/
thd->some_tables_deleted= 0;
goto retry; goto retry;
} }