revision-id: 9cd4d76577a917c06a797ba2b758520a097f3355 (mariadb-10.6.1-127-g9cd4d76577a) parent(s): f46830e5b8ebebd907df170e80481487b713bb61 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-09-10 19:49:33 +0300 message: Fix compile warnings/error on Windows --- sql/opt_histogram_json.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index db75c8e09bd..2f4174ecf51 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -104,7 +104,7 @@ class Histogram_json_builder : public Histogram_builder @param elem The value we are writing @param cnt The number of such values. */ - void start_bucket(void *elem, element_count cnt) + void start_bucket(void *elem, longlong cnt) { DBUG_ASSERT(bucket.size == 0); column->store_field_value((uchar*) elem, col_length); @@ -121,7 +121,7 @@ class Histogram_json_builder : public Histogram_builder /* Append a value group of cnt values. */ - void append_to_bucket(element_count cnt) + void append_to_bucket(longlong cnt) { bucket.ndv++; bucket.size += cnt; @@ -141,7 +141,7 @@ class Histogram_json_builder : public Histogram_builder @return 0 - OK */ - int next(void *elem, element_count elem_cnt) override + int next(void *elem, longlong elem_cnt) override { counters.next(elem, elem_cnt); ulonglong count= counters.get_count();