diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 17:13:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 22:59:19 +0300 |
| commit | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (patch) | |
| tree | 660faff324d2f66e57e2800155196739bf972dc1 /sql/sql_parse.cc | |
| parent | f3f23b5c4bdc669ad0af4a1c79bd70c40ed9c594 (diff) | |
| parent | 07e89bf7d15ba9e9a3b21d087c20d687446b2ff7 (diff) | |
| download | mariadb-git-8a0944080c950349aaf7c81bc8f8c63b262f98eb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ead6235461e..835848d56e4 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8645,6 +8645,11 @@ bool st_select_lex::add_window_def(THD *thd, win_frame); group_list= thd->lex->save_group_list; order_list= thd->lex->save_order_list; + if (parsing_place != SELECT_LIST) + { + fields_in_window_functions+= win_part_list_ptr->elements + + win_order_list_ptr->elements; + } return (win_def == NULL || window_specs.push_back(win_def)); } @@ -8666,6 +8671,11 @@ bool st_select_lex::add_window_spec(THD *thd, win_frame); group_list= thd->lex->save_group_list; order_list= thd->lex->save_order_list; + if (parsing_place != SELECT_LIST) + { + fields_in_window_functions+= win_part_list_ptr->elements + + win_order_list_ptr->elements; + } thd->lex->win_spec= win_spec; return (win_spec == NULL || window_specs.push_back(win_spec)); } |