diff options
| author | Michael Widenius <monty@mariadb.org> | 2023-02-20 12:28:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2023-02-21 09:18:35 +0200 |
| commit | e91b56c059b5fce9487ebc3b302774db1ab13a3b (patch) | |
| tree | 8b5b9bbb63ee15a720056b68388e4fac9775d0f6 /sql/sql_union.cc | |
| parent | 24c4877e3948e1de799fe037ba6318f6a8c42d85 (diff) | |
| download | mariadb-git-bb-11.0.tar.gz | |
squash! 4cb69791aaa59e786859405c3c3826a6a15c4a09bb-11.0
- Ensure that TEMP_TABLE_PARAM.func_count includes all items that may
need a copy function.
- Fixed that Aria allocates enough space for key copies.
- Fixed that Aria does not check empty_bits if not allocated.
The first issue could cause crashes, the other issues should not
affect anything.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5d3db73d4e2..7e27a8ff980 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -383,7 +383,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, |