mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1
into dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
This commit is contained in:
@ -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)
|
||||||
|
Reference in New Issue
Block a user