summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-06-05 15:30:57 +0300
committerGeorgi Kodinov <joro@sun.com>2009-06-05 15:30:57 +0300
commit1a8eb91e06b3e92ff2f034666f06f9a2952c193f (patch)
treea617aeeb8a573f036ab34bd719614ff170116bf0 /strings
parent284a14edc5cf27af4ee8b7257f2bb5696316db06 (diff)
parent5ec61b304c1c7ed03e5df9257f0bc5cb01f6bc36 (diff)
downloadmariadb-git-1a8eb91e06b3e92ff2f034666f06f9a2952c193f.tar.gz
automerge
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/ctype.c b/strings/ctype.c
index 446eb168804..4a54d898337 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -328,7 +328,10 @@ my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong length)
{
my_wc_t wc;
int chlen;
- for (; (chlen= cs->cset->mb_wc(cs, &wc, str, strend)) > 0; str+= chlen)
+ for (; (chlen= cs->cset->mb_wc(cs, &wc,
+ (const unsigned char *) str,
+ (const unsigned char *) strend)) > 0;
+ str+= chlen)
{
if (wc > 0x7F)
return MY_REPERTOIRE_UNICODE30;