diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-16 16:24:46 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-16 16:24:46 +0300 |
| commit | e77e8e75d2e5faad5860653fa73186090bf67d1c (patch) | |
| tree | 23a14c8221f0e0a31e95198595c363f3d0ec588b /sql/sql_select.cc | |
| parent | a202a4796e991117f9947aeaec4e67682915ca5e (diff) | |
| parent | d6be282604e7ad591410428dd1828173871fb112 (diff) | |
| download | mariadb-git-e77e8e75d2e5faad5860653fa73186090bf67d1c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6e8cc843d1a..e8e111a9a37 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8465,6 +8465,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, } } else if ((pos->type() == Item::FUNC_ITEM || + pos->type() == Item::SUBSELECT_ITEM || + pos->type() == Item::CACHE_ITEM || pos->type() == Item::COND_ITEM) && !pos->with_sum_func) { // Save for send fields |