revision-id: bfdc2ee636901e6f4c86a94e082092e5edc931a1 (mariadb-10.6.1-122-gbfdc2ee6369) parent(s): d43552edd3b32209aab3150069a4b4f29c9e2e7c author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-09-07 10:38:36 +0300 message: Fix compilation on windows --- sql/opt_histogram_json.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 2817a257838..f1030662572 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -220,11 +220,11 @@ bool Histogram_json_hb::parse(MEM_ROOT *mem_root, Field *field, static -void store_key_image_to_rec_no_null(Field *field, const char *ptr, uint len) +void store_key_image_to_rec_no_null(Field *field, const char *ptr, size_t len) { MY_BITMAP *old_map= dbug_tmp_use_all_columns(field->table, &field->table->write_set); - field->set_key_image((const uchar*)ptr, len); + field->set_key_image((const uchar*)ptr, (uint)len); dbug_tmp_restore_column_map(&field->table->write_set, old_map); }