diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:36:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:36:06 +0200 |
| commit | 25c048066a9557d1aa506220316c6fa57be5da91 (patch) | |
| tree | 13b0632a86ff34973ece033ef949b0c74002fa50 | |
| parent | 49e2b50d594dfee462505b8fab2d8ba875dcf6e0 (diff) | |
| parent | 948fb3c27d1e0754d99a96389aaf1cf85370d839 (diff) | |
| download | mariadb-git-25c048066a9557d1aa506220316c6fa57be5da91.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b9289ec10e4..14766302298 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19413,8 +19413,8 @@ bool Create_tmp_table::add_fields(THD *thd, table->field[fieldnr]= 0; // End marker share->blob_field[m_blob_count]= 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); + DBUG_ASSERT(param->func_count <= param->copy_func_count); share->column_bitmap_size= bitmap_buffer_size(share->fields); |