diff options
| author | holyfoot@mysql.com <> | 2005-11-03 14:54:13 +0400 |
|---|---|---|
| committer | holyfoot@mysql.com <> | 2005-11-03 14:54:13 +0400 |
| commit | e9f256e2bd34ad1474c9a4e143dd06f65c567d90 (patch) | |
| tree | fb552997262b1fc46db2da094e9410a10459583e /sql | |
| parent | d028e8e0635b2abe2735e2248aebc95c42b37cc3 (diff) | |
| parent | fda75b151916fcf308ec56ea9381f2b2db6ac241 (diff) | |
| download | mariadb-git-e9f256e2bd34ad1474c9a4e143dd06f65c567d90.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 285a5c5696b..4254f90d628 100644 --- 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 |