diff options
| author | unknown <evgen@moonbone.local> | 2006-09-28 15:53:22 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-09-28 15:53:22 +0400 |
| commit | 00f0f92015260699f1895e7c8986141dfc78bbdf (patch) | |
| tree | 281f4bd51979a812d9b2da2dd2bbf8f21bf98535 /sql/item.cc | |
| parent | c1bbfb2b6732470d84e03c79b56dd5685e3064a6 (diff) | |
| parent | b828758ac26f6ebe1ef6a1a56cf0eca90f540ab3 (diff) | |
| download | mariadb-git-00f0f92015260699f1895e7c8986141dfc78bbdf.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into moonbone.local:/work/18360-bug-5.1-opt-mysql
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
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 f1c7a052988..ed938a853e3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1210,6 +1210,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)) { |