diff options
| author | unknown <joerg@mysql.com> | 2005-03-21 16:46:11 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-03-21 16:46:11 +0100 |
| commit | 7fdc63fe4aa206862af6d77a9ea140fbf1ecf18f (patch) | |
| tree | 52c8231c563d30c187b398f1dba85b2970c05a6d /sql/item_sum.cc | |
| parent | 3231241f837729781339f68c270252ac80d11a52 (diff) | |
| parent | 04a410d4e9a502f9950688fefd35451a84d0f1d5 (diff) | |
| download | mariadb-git-7fdc63fe4aa206862af6d77a9ea140fbf1ecf18f.tar.gz | |
Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 9fc68931ef6..02b894e58bc 100644 --- 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; |