diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
| commit | 9936cfd531a49b0ba124c4eb38a6099ec420c7fd (patch) | |
| tree | 52e3c6dd19846b7ff0d895c31e78bc1e781ca780 /sql/sql_lex.cc | |
| parent | a7634281aa64a549d19cd20ead7e80d0267271ee (diff) | |
| parent | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (diff) | |
| download | mariadb-git-9936cfd531a49b0ba124c4eb38a6099ec420c7fd.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 99fc25d0f26..eb22534f4fb 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2409,6 +2409,7 @@ void st_select_lex::init_query() n_sum_items= 0; n_child_sum_items= 0; hidden_bit_fields= 0; + fields_in_window_functions= 0; subquery_in_having= explicit_limit= 0; is_item_list_lookup= 0; changed_elements= 0; @@ -2970,7 +2971,8 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) select_n_having_items + select_n_where_fields + order_group_num + - hidden_bit_fields) * 5; + hidden_bit_fields + + fields_in_window_functions) * 5; if (!ref_pointer_array.is_null()) { /* |