diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
| commit | fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670 (patch) | |
| tree | d3f4f28b6bb2ffa6e6c4b19e6c03f2e209590171 /sql/item_cmpfunc.cc | |
| parent | 4cfef2a5a4157269244923637032c21ff67b0161 (diff) | |
| parent | 96f06f952d087bd47225cc2784edbb0510fad818 (diff) | |
| download | mariadb-git-fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 46e5fb04a85..e8cd2be2650 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -4540,11 +4540,11 @@ Item_cond::fix_fields(THD *thd, Item **ref) const_item_cache= FALSE; } - with_sum_func= with_sum_func || item->with_sum_func; - with_field= with_field || item->with_field; - with_subselect|= item->has_subquery(); - if (item->maybe_null) - maybe_null=1; + with_sum_func|= item->with_sum_func; + with_field|= item->with_field; + with_subselect|= item->has_subquery(); + with_window_func|= item->with_window_func; + maybe_null|= item->maybe_null; } fix_length_and_dec(); fixed= 1; |