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

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

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
e9f256e2 · holyfoot@mysql.com · d028e8e0 · fda75b15 · e9f256e2
Commit e9f256e2 authored Nov 03, 2005 by holyfoot@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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