summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2023-02-20 12:28:44 +0200
committerMichael Widenius <monty@mariadb.org>2023-02-21 09:18:35 +0200
commite91b56c059b5fce9487ebc3b302774db1ab13a3b (patch)
tree8b5b9bbb63ee15a720056b68388e4fac9775d0f6 /sql/sql_class.cc
parent24c4877e3948e1de799fe037ba6318f6a8c42d85 (diff)
downloadmariadb-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_class.cc')
-rw-r--r--sql/sql_class.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 17ce7b3c048..beebaf12765 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4287,6 +4287,7 @@ create_result_table(THD *thd_arg, List<Item> *column_types,
{
DBUG_ASSERT(table == 0);
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;
if (! (table= create_tmp_table(thd_arg, &tmp_table_param, *column_types,