Commit 7fdc63fe authored by unknown's avatar unknown
Browse files

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


sql/item_sum.cc:
  Auto merged
parents 3231241f 04a410d4

sql/item_sum.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;