summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2021-09-07 10:38:36 +0300
committerSergei Petrunia <psergey@askmonty.org>2021-09-07 10:38:36 +0300
commitbfdc2ee636901e6f4c86a94e082092e5edc931a1 (patch)
tree5be5fba263eb062b9af8fc82ec9b0543ffa68c8d
parentd43552edd3b32209aab3150069a4b4f29c9e2e7c (diff)
downloadmariadb-git-bb-10.7-mdev21130.tar.gz
Fix compilation on windowsbb-10.7-mdev21130
-rw-r--r--sql/opt_histogram_json.cc4
1 files 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 @@ error:
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);
}