diff options
| author | unknown <guilhem@gbichot3.local> | 2006-07-10 17:06:19 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-07-10 17:06:19 +0200 |
| commit | 4ce8ca64647b998071c5bceef1036f169e7cfd5b (patch) | |
| tree | 547be82f5c0c2d20c6c8ab5114ff983fe9a1f90d | |
| parent | 9ba38382705af826200ac30c0fbaad9022dd4196 (diff) | |
| parent | bd0f363dcb2d4395bc365c85ae37f2132b5ed96b (diff) | |
| download | mariadb-git-4ce8ca64647b998071c5bceef1036f169e7cfd5b.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into gbichot3.local:/home/mysql_src/mysql-5.0
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ba9fa6f6c80..c6f491cdb61 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; @@ -648,7 +650,6 @@ void close_temporary_tables(THD *thd) insertion sort of temp tables by pseudo_thread_id to build ordered list of sublists of equal pseudo_thread_id */ - for (prev_table= thd->temporary_tables, table= prev_table->next; table; prev_table= table, table= table->next) |