diff options
| author | unknown <holyfoot@mysql.com> | 2005-11-03 14:54:13 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2005-11-03 14:54:13 +0400 |
| commit | 4535c354e326bd2e37567443c28ff58fe379ed19 (patch) | |
| tree | fb552997262b1fc46db2da094e9410a10459583e /sql/sql_select.cc | |
| parent | 096f181d3aae24790daf5711295e570d11c5776f (diff) | |
| parent | d44316cd44df5286da8f687455a85a1da5290872 (diff) | |
| download | mariadb-git-4535c354e326bd2e37567443c28ff58fe379ed19.tar.gz | |
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
Diffstat (limited to 'sql/sql_select.cc')
| -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 |