diff options
author | unknown <jimw@mysql.com> | 2005-03-18 16:15:33 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-03-18 16:15:33 -0800 |
commit | ebd6fd9315b4a815991ce9737284ac0dd6812791 (patch) | |
tree | ce7f2c25e050b4b82ade6b57c76c0bcc591ab9b7 | |
parent | a7a4191c99824646ddee8393a478fd0d466556b6 (diff) | |
download | mariadb-git-ebd6fd9315b4a815991ce9737284ac0dd6812791.tar.gz |
Fix Windows compile errors.
sql/item_sum.cc:
Remove C_MODE_START/END around function, add cast
-rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b18653ed5a4..dd95a83a921 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -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() { |