Commit 4535c354 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 

into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged
parents 096f181d d44316cd

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -8029,7 +8029,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, 


  statistic_increment(thd->status_var.created_tmp_tables, &LOCK_status);



  if (use_temp_pool)

  if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))

    temp_pool_slot = bitmap_set_next(&temp_pool);



  if (temp_pool_slot != MY_BIT_NONE) // we got a slot