diff options
author | unknown <hf@deer.(none)> | 2004-03-04 17:52:06 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2004-03-04 17:52:06 +0400 |
commit | 930399d773b05391f862ea2210136ac735380411 (patch) | |
tree | ce98f8ae79454b113b49d1147e3bc6ad5d6dd81e /sql/item_subselect.cc | |
parent | eb7516c479c329bb8292b9a17193d34794477bca (diff) | |
parent | 859f599e1ed8a85b6c8909b32fdfa5dc223e929b (diff) | |
download | mariadb-git-930399d773b05391f862ea2210136ac735380411.tar.gz |
Merging
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
mysql-test/r/subselect.result:
merging
mysql-test/t/subselect.test:
merging
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index bfe41726f72..372f086d464 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -198,6 +198,12 @@ bool Item_subselect::const_item() const return const_item_cache; } +Item *Item_subselect::get_tmp_table_item(THD *thd) +{ + if (!with_sum_func && !const_item()) + return new Item_field(result_field); + return copy_or_same(thd); +} void Item_subselect::update_used_tables() { |