database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code 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.


sql/sql_handler.cc:
  Properly reset thd->some_tables_deleted if mysql_lock_tables
  fails for some reason.
This commit is contained in:
unknown
2007-10-12 10:55:46 -03:00
parent 91923ed2d4
commit 4eb4b37cfa
1 changed files with 6 additions and 0 deletions
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;
} }