Commit b6121ca3 authored by Sergei Petrunia's avatar Sergei Petrunia

Fix compile warnings/error on Windows

parent 6375873c
...@@ -104,7 +104,7 @@ class Histogram_json_builder : public Histogram_builder ...@@ -104,7 +104,7 @@ class Histogram_json_builder : public Histogram_builder
@param elem The value we are writing @param elem The value we are writing
@param cnt The number of such values. @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); DBUG_ASSERT(bucket.size == 0);
column->store_field_value((uchar*) elem, col_length); column->store_field_value((uchar*) elem, col_length);
...@@ -121,7 +121,7 @@ class Histogram_json_builder : public Histogram_builder ...@@ -121,7 +121,7 @@ class Histogram_json_builder : public Histogram_builder
/* /*
Append a value group of cnt values. Append a value group of cnt values.
*/ */
void append_to_bucket(element_count cnt) void append_to_bucket(longlong cnt)
{ {
bucket.ndv++; bucket.ndv++;
bucket.size += cnt; bucket.size += cnt;
...@@ -141,7 +141,7 @@ class Histogram_json_builder : public Histogram_builder ...@@ -141,7 +141,7 @@ class Histogram_json_builder : public Histogram_builder
@return @return
0 - OK 0 - OK
*/ */
int next(void *elem, element_count elem_cnt) override int next(void *elem, longlong elem_cnt) override
{ {
counters.next(elem, elem_cnt); counters.next(elem, elem_cnt);
ulonglong count= counters.get_count(); ulonglong count= counters.get_count();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment