diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
| commit | 7cb3520c0632ad912b309489ad86a90f9fc9bd0b (patch) | |
| tree | ff8e6b8fdf5e9cacdfe914790e480bc3bad2ad85 /sql/item_windowfunc.cc | |
| parent | 51b30586ea999744de6a15146257f2976825781e (diff) | |
| parent | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (diff) | |
| download | mariadb-git-7cb3520c0632ad912b309489ad86a90f9fc9bd0b.tar.gz | |
Merge bb-10.2-ext into 10.3
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 8432ab43ad8..cd0fb5058a6 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -334,8 +334,8 @@ bool Item_sum_hybrid_simple::fix_fields(THD *thd, Item **ref) return TRUE; } Type_std_attributes::set(args[0]); - for (uint i= 0; i < arg_count && !with_subselect; i++) - with_subselect= with_subselect || args[i]->with_subselect; + for (uint i= 0; i < arg_count && !m_with_subquery; i++) + m_with_subquery|= args[i]->with_subquery(); Item *item2= args[0]->real_item(); if (item2->type() == Item::FIELD_ITEM) |