database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1

Browse Source 
into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog


sql/sql_base.cc:
  Manual merge
This commit is contained in:
unknown
2006-07-10 13:11:29 +03:00
parent 394099369b 868fee4dde
commit bd0f363dcb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_base.cc
View File

@ -624,8 +624,10 @@ void close_temporary_tables(THD *thd)
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;
@ -648,7 +650,6 @@ void close_temporary_tables(THD *thd)
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
*/ */
for (prev_table= thd->temporary_tables, table= prev_table->next; for (prev_table= thd->temporary_tables, table= prev_table->next;
table; table;
prev_table= table, table= table->next) prev_table= table, table= table->next)