diff options
author | dlenev@mockturtle.local <> | 2006-10-02 22:53:10 +0400 |
---|---|---|
committer | dlenev@mockturtle.local <> | 2006-10-02 22:53:10 +0400 |
commit | 8eb4401c5948f6e25e6d9894244d0d8eeea7e652 (patch) | |
tree | 5bb148bebab77a9d2565aed7985b1dd0c5d3f41d /sql/item.cc | |
parent | f732270e5bc0de6a4fe768a85a72c84136739452 (diff) | |
parent | d74621142bc184cd92433ad0872cd2c511791ac9 (diff) | |
download | mariadb-git-8eb4401c5948f6e25e6d9894244d0d8eeea7e652.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index ba13ba985b5..d56ca95093b 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1182,6 +1182,7 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array, split_sum_func(thd, ref_pointer_array, fields); } else if ((type() == SUM_FUNC_ITEM || (used_tables() & ~PARAM_TABLE_BIT)) && + type() != SUBSELECT_ITEM && (type() != REF_ITEM || ((Item_ref*)this)->ref_type() == Item_ref::VIEW_REF)) { |