diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
| commit | 1813d92d0c505a1c752f4a9d6e37db6bffe4efdd (patch) | |
| tree | f570314890197949ae55cbbad3a94eb5893c4177 /sql/item_windowfunc.cc | |
| parent | 0fe97c20b341665058491fca4d665207406775c6 (diff) | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| download | mariadb-git-1813d92d0c505a1c752f4a9d6e37db6bffe4efdd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_windowfunc.cc')
| -rw-r--r-- | sql/item_windowfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_windowfunc.cc b/sql/item_windowfunc.cc index acf2ee4fdda..25e86c5d777 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2016,2017 MariaDB + Copyright (c) 2016, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -341,9 +341,9 @@ bool Item_sum_hybrid_simple::fix_fields(THD *thd, Item **ref) for (uint i= 0; i < arg_count; i++) { - // 'item' can be changed during fix_fields if (args[i]->fix_fields_if_needed_for_scalar(thd, &args[i])) return TRUE; + with_window_func|= args[i]->with_window_func; } for (uint i= 0; i < arg_count && !m_with_subquery; i++) |