Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0

86574f48 · joerg@mysql.com · d5af61b1 · d9354fb8 · 86574f48
Commit 86574f48 authored Mar 21, 2005 by joerg@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_sum.cc sql/item_sum.cc +1 -1

No files found.
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2158,7 +2158,7 @@ int composite_key_cmp(void* arg, byte* key1, byte* key2)
 }
-static int count_distinct_walk(void *elem, unsigned int count, void *arg)
+static int count_distinct_walk(void *elem, element_count count, void *arg)
 {
  (*((ulonglong*)arg))++;
  return 0;