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

Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1

Browse Source 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl
This commit is contained in:
unknown 2006-07-12 10:04:40 +02:00
commit 1787072458
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@ -496,11 +496,13 @@ void close_temporary_tables(THD *thd)
TABLE *table; TABLE *table;
if (!thd->temporary_tables) if (!thd->temporary_tables)
return; return;
if (!mysql_bin_log.is_open()) 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); close_temporary(table, 1);
} }
thd->temporary_tables= 0; thd->temporary_tables= 0;
@ -518,7 +520,7 @@ void close_temporary_tables(THD *thd)
String s_query= String(buf, sizeof(buf), system_charset_info); String s_query= String(buf, sizeof(buf), system_charset_info);
bool found_user_tables= false; bool found_user_tables= false;
LINT_INIT(next); LINT_INIT(next);
/* /*
insertion sort of temp tables by pseudo_thread_id to build ordered list insertion sort of temp tables by pseudo_thread_id to build ordered list
of sublists of equal pseudo_thread_id of sublists of equal pseudo_thread_id