mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:
mkindahl@dl145k.mysql.com 2006-07-12 10:04:40 +02:00
commit 0f070b0b32
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;
if (!thd->temporary_tables)
return;
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;
@ -518,7 +520,7 @@ void close_temporary_tables(THD *thd)
String s_query= String(buf, sizeof(buf), system_charset_info);
bool found_user_tables= false;
LINT_INIT(next);
/*
insertion sort of temp tables by pseudo_thread_id to build ordered list
of sublists of equal pseudo_thread_id