diff options
author | unknown <davi@moksha.com.br> | 2007-10-12 10:56:50 -0300 |
---|---|---|
committer | unknown <davi@moksha.com.br> | 2007-10-12 10:56:50 -0300 |
commit | 7c25308aa4c65ea31662981edd55389d8b27be34 (patch) | |
tree | 70ab1bdcef0eb0e9763e191a19a32b91497fb9d0 /sql/sql_handler.cc | |
parent | 03e74b8c5ea1764cb4f74e386d2a6ba4416e2e07 (diff) | |
parent | 4eb4b37cfa8291e0740d4f5978a40974308dee63 (diff) | |
download | mariadb-git-7c25308aa4c65ea31662981edd55389d8b27be34.tar.gz |
Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
sql/sql_handler.cc:
Auto merged
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r-- | sql/sql_handler.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 19f54669c2f..ed7e30c1fef 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -466,6 +466,12 @@ retry: { mysql_ha_close_table(thd, tables); 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; } |