diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 16:05:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 16:05:21 +0200 |
| commit | 085d0ac23868603bc7400d4b0949c63ce3a85a31 (patch) | |
| tree | 40336fd6ee3f3d63d4425e763ae6fa5bec36ef9c /sql/sql_union.cc | |
| parent | 3e2ad0e918d5d38322994ec9e08fc5dda3a80707 (diff) | |
| parent | c14a39431b211017e6809bb79c4079b38ffc3dff (diff) | |
| download | mariadb-git-085d0ac23868603bc7400d4b0949c63ce3a85a31.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 758edbdcbaa..f88f515f0d2 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -344,6 +344,7 @@ select_unit::create_result_table(THD *thd_arg, List<Item> *column_types, DBUG_ASSERT(table == 0); tmp_table_param.init(); tmp_table_param.field_count= column_types->elements; + tmp_table_param.func_count= tmp_table_param.field_count; tmp_table_param.bit_fields_as_long= bit_fields_as_long; tmp_table_param.hidden_field_count= hidden; @@ -384,7 +385,8 @@ select_union_recursive::create_result_table(THD *thd_arg, return true; incr_table_param.init(); - incr_table_param.field_count= column_types->elements; + incr_table_param.field_count= incr_table_param.func_count= + column_types->elements; incr_table_param.bit_fields_as_long= bit_fields_as_long; if (! (incr_table= create_tmp_table(thd_arg, &incr_table_param, *column_types, (ORDER*) 0, false, 1, |