diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
| commit | e67daa5653490074850bc9f5d2deef58f2a10d8e (patch) | |
| tree | cf631a1ff96be08423d909702ca3558fda6e56c0 /sql/sql_lex.cc | |
| parent | eb2eaba7fdbd13c9814ab4619cc23d9f140e5485 (diff) | |
| parent | ced3ec4c9ce0853c564532fbe90656cf1c3c2bed (diff) | |
| download | mariadb-git-e67daa5653490074850bc9f5d2deef58f2a10d8e.tar.gz | |
Merge 10.4 into 10.5
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 4cc93c31b38..86c24ab6c9b 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2941,6 +2941,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; @@ -3503,7 +3504,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()) { /* |