1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä 2023-03-06 13:36:06 +02:00
commit 25c048066a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -19413,8 +19413,8 @@ bool Create_tmp_table::add_fields(THD *thd,
table->field[fieldnr]= 0; // End marker table->field[fieldnr]= 0; // End marker
share->blob_field[m_blob_count]= 0; // End marker share->blob_field[m_blob_count]= 0; // End marker
copy_func[0]= 0; // End marker copy_func[0]= 0; // End marker
DBUG_ASSERT((copy_func - param->items_to_copy) <= param->copy_func_count);
param->func_count= (uint) (copy_func - param->items_to_copy); param->func_count= (uint) (copy_func - param->items_to_copy);
DBUG_ASSERT(param->func_count <= param->copy_func_count);
share->column_bitmap_size= bitmap_buffer_size(share->fields); share->column_bitmap_size= bitmap_buffer_size(share->fields);