summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-08-21 03:00:52 +0300
committermonty@donna.mysql.com <>2000-08-21 03:00:52 +0300
commitaa3580924bb1a036a5b4ce7c6f4c930499eb09e2 (patch)
treef46edbbf41f400440bde25519820b29885305b1b /strings
parent86f4dbe20e850a6161d69b7407838c28a8bf93f9 (diff)
downloadmariadb-git-aa3580924bb1a036a5b4ce7c6f4c930499eb09e2.tar.gz
RENAME TABLE table_name TO new_table_name ; Faster Alloc
Small bug fixes
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-sjis.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 119443a0c95..9a5a91f9265 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -224,7 +224,8 @@ int my_strnncoll_sjis(const uchar *s1, int len1, const uchar *s2, int len2)
int my_strcoll_sjis(const uchar *s1, const uchar *s2)
{
- return (uint) my_strnncoll_sjis(s1,(uint) strlen(s1), s2,(uint) strlen(s2));
+ return (uint) my_strnncoll_sjis(s1,(uint) strlen((char*) s1),
+ s2,(uint) strlen((char*) s2));
}
int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
@@ -245,7 +246,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
int my_strxfrm_sjis(uchar *dest, uchar *src, int len)
{
- return my_strnxfrm_sjis(dest, src, len, (uint) strlen(src));
+ return my_strnxfrm_sjis(dest, src, len, (uint) strlen((char*) src));
}