Commit bd0f363d authored by unknown's avatar unknown
Browse files

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


sql/sql_base.cc:
  Manual merge
parents 39409936 868fee4d

sql/sql_base.cc

+3 −2
Original line number Diff line number Diff line
@@ -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)