summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraelkin@dl145j.mysql.com <>2006-08-21 11:44:30 +0200
committeraelkin@dl145j.mysql.com <>2006-08-21 11:44:30 +0200
commit8a55763f286c48a8030d697a509f9b5372fcab06 (patch)
treeb79595e4a0e07db812259488c11336bc05407d8c
parent1917a99270248262f7420fc61a6f1f50bf03b9a6 (diff)
downloadmariadb-git-8a55763f286c48a8030d697a509f9b5372fcab06.tar.gz
BUG#21582 mysql server crashes in close_temporary_tables
the problem is described and resolved by 20919 which fix happened not to have got to the release tree. Applying the patch of the parent bug.
-rw-r--r--sql/sql_base.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 5904e13d710..ffd40df2fdc 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -624,8 +624,10 @@ void close_temporary_tables(THD *thd)
if (!mysql_bin_log.is_open())
{
- for (table= thd->temporary_tables; table; table= table->next)
+ TABLE *next;
+ for (table= thd->temporary_tables; table; table= next)
{
+ next= table->next;
close_temporary(table, 1);
}
thd->temporary_tables= 0;