diff options
author | unknown <bell@sanja.is.com.ua> | 2004-05-07 23:06:11 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-05-07 23:06:11 +0300 |
commit | e54ca13b666b48226b7a54d6847d6437ac32ae74 (patch) | |
tree | 52e47dc7ee99268a0b704b1402fdd7b965199c80 /sql/item_sum.h | |
parent | c207325aaf0cbb3781d72891c9ae95e18c6ea355 (diff) | |
download | mariadb-git-e54ca13b666b48226b7a54d6847d6437ac32ae74.tar.gz |
keep old engine & JOIN if we changed subquery Item (Bug #3646)
mysql-test/r/subselect.result:
ALL/ANY test
mysql-test/t/subselect.test:
ALL/ANY test
sql/item_subselect.cc:
keep old engine & JOIN if we changed subquery Item, which allow avoid second all SELECT items fix_fields call with pervios clean up (because of second setup_tables which remove table->key_use and maybe something else)
keep list when we change Item in SELECT list
processing inserted max/min function (now JOIN::prepare will be called only once)
methods of changing item for subselect engines
sql/item_subselect.h:
change item & results procedure
sql/item_sum.cc:
Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
sql/item_sum.h:
Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
sql/sql_lex.cc:
note about new method
sql/sql_lex.h:
method for changing result of UNION JOINs
sql/sql_select.cc:
method for changing result in JOIN
sql/sql_select.h:
method for changing result in JOIN
sql/sql_union.cc:
method for changing result in JOIN
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r-- | sql/item_sum.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 4cded41a9f6..ef947900fd2 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -415,13 +415,7 @@ class Item_sum_hybrid :public Item_sum table_map used_tables() const { return used_table_cache; } bool const_item() const { return !used_table_cache; } - void clear() - { - sum=0.0; - sum_int=0; - value.length(0); - null_value=1; - } + void clear(); double val(); longlong val_int(); void reset_field(); |