summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-03-04 17:52:06 +0400
committerunknown <hf@deer.(none)>2004-03-04 17:52:06 +0400
commit6ee7adaba5808bb1a9eee2013021f89175d92108 (patch)
treece98f8ae79454b113b49d1147e3bc6ad5d6dd81e /sql/item_subselect.cc
parentdc6bd375c6e5b86ffa3ba6865da9458414a8269a (diff)
parent8a833992e668806ce53778a71dc25d03c9dcd8d1 (diff)
downloadmariadb-git-6ee7adaba5808bb1a9eee2013021f89175d92108.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.cc6
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()
{