summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authortsmith@quadxeon.mysql.com <>2007-06-06 00:22:35 +0200
committertsmith@quadxeon.mysql.com <>2007-06-06 00:22:35 +0200
commit60f6e71ef8a441be15f63bb540ed6d7dac20de4e (patch)
tree04f5dd77edf53732d84661a0431ca91eb30eb03e /strings
parent6d86790711d1dab56f6c49d4e40d2bd7f2a8b062 (diff)
downloadmariadb-git-60f6e71ef8a441be15f63bb540ed6d7dac20de4e.tar.gz
ctype-bin.c:
Post-merge fix warning
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-bin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index b24470747e6..95d97af2bfb 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -273,7 +273,8 @@ static int my_wc_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
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;