bk commit into 5.1 tree (tsmith:1.2543)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-06 00:22:35+02:00, tsmith@stripped +1 -0
  ctype-bin.c:
    Post-merge fix warning

  strings/ctype-bin.c@stripped, 2007-06-06 00:22:24+02:00, tsmith@stripped +2 -1
    Post-merge fix warning

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51

--- 1.77/strings/ctype-bin.c	2007-06-05 17:51:13 +02:00
+++ 1.78/strings/ctype-bin.c	2007-06-06 00:22:24 +02:00
@@ -273,7 +273,8 @@ static int my_wc_mb_bin(CHARSET_INFO *cs
 
 
 void my_hash_sort_8bit_bin(CHARSET_INFO *cs __attribute__((unused)),
-		      const uchar *key, uint len,ulong *nr1, ulong *nr2)
+                           const uchar *key, size_t len,
+                           ulong *nr1, ulong *nr2)
 {
   const uchar *pos = key;