diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /sql/item_cmpfunc.h | |
parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 776ac27eb75..63c131cd8f4 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -659,7 +659,7 @@ public: class Item_func_not_all :public Item_func_not { /* allow to check presence of values in max/min optimization */ - Item_sum_hybrid *test_sum_item; + Item_sum_min_max *test_sum_item; Item_maxmin_subselect *test_sub_item; public: @@ -675,7 +675,7 @@ public: bool fix_fields(THD *thd, Item **ref) {return Item_func::fix_fields(thd, ref);} virtual void print(String *str, enum_query_type query_type); - void set_sum_test(Item_sum_hybrid *item) { test_sum_item= item; test_sub_item= 0; }; + void set_sum_test(Item_sum_min_max *item) { test_sum_item= item; test_sub_item= 0; }; void set_sub_test(Item_maxmin_subselect *item) { test_sub_item= item; test_sum_item= 0;}; bool empty_underlying_subquery(); Item *neg_transformer(THD *thd); |