diff options
| author | unknown <igor@rurik.mysql.com> | 2006-09-25 06:46:15 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-09-25 06:46:15 -0700 |
| commit | 5b30853d5fcdbd3b23243d2d49cd2c706ce177fe (patch) | |
| tree | 0781f2db5d1830a6152b9df01bb8d4ce8a753919 /sql/item.cc | |
| parent | 82703ea494353bfa08fb6c1f73581c4a57b8a4be (diff) | |
| parent | c492b1494489ec588cd291bf89d25377c1c07f0d (diff) | |
| download | mariadb-git-5b30853d5fcdbd3b23243d2d49cd2c706ce177fe.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
sql/item.cc:
Manual 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 de78a2539a7..a0eef7a19e9 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)) { |