diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-06-05 15:30:57 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-06-05 15:30:57 +0300 |
| commit | 5fc05b9528a63768831171de669352f4e52342f1 (patch) | |
| tree | a617aeeb8a573f036ab34bd719614ff170116bf0 /strings | |
| parent | 51dd28a9a93f69be4b2c06d205d5d82db05b4cc8 (diff) | |
| parent | 22454390c0ce1c3f90059811548a71ee18cac4f3 (diff) | |
| download | mariadb-git-5fc05b9528a63768831171de669352f4e52342f1.tar.gz | |
automerge
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype.c | 5 |
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; |