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_lex.cc | |
| parent | f3f23b5c4bdc669ad0af4a1c79bd70c40ed9c594 (diff) | |
| parent | 07e89bf7d15ba9e9a3b21d087c20d687446b2ff7 (diff) | |
| download | mariadb-git-8a0944080c950349aaf7c81bc8f8c63b262f98eb.tar.gz | |
Merge 10.2 into 10.3
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 0b423355170..e2e80cb21f6 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2344,6 +2344,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; @@ -2888,7 +2889,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()) { /* |