Commit ebd6fd93 authored by unknown's avatar unknown

Fix Windows compile errors.


sql/item_sum.cc:
  Remove C_MODE_START/END around function, add cast
parent a7a4191c
......@@ -2128,7 +2128,7 @@ my_decimal *Item_variance_field::val_decimal(my_decimal *dec_buf)
int simple_str_key_cmp(void* arg, byte* key1, byte* key2)
{
Field *f= (Field*) arg;
return f->cmp(key1, key2);
return f->cmp((const char*)key1, (const char*)key2);
}
/*
......@@ -2158,16 +2158,12 @@ int composite_key_cmp(void* arg, byte* key1, byte* key2)
}
C_MODE_START
static int count_distinct_walk(void *elem, unsigned int count, void *arg)
{
(*((ulonglong*)arg))++;
return 0;
}
C_MODE_END
void Item_sum_count_distinct::cleanup()
{
......
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