diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 15:05:44 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 15:05:44 +0200 |
| commit | 6e422ce034e5e4a1775c8b28abb8f5deca3f1bd9 (patch) | |
| tree | 4facc4da6326a6afd10165518d8ca3baf64d185a /strings | |
| parent | 3738f7857f56d6728db328b11d956d9eb28933a5 (diff) | |
| download | mariadb-git-6e422ce034e5e4a1775c8b28abb8f5deca3f1bd9.tar.gz | |
Addendum to Bug #45286: backport macro name form other tree
use same (slightly unwieldy) name in all trees; fix before this version goes "public".
bless ctype to avoid upmerge conflict, le sigh.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/strings/ctype.c b/strings/ctype.c index 4a54d898337..17ad1256e74 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -328,9 +328,8 @@ 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, - (const unsigned char *) str, - (const unsigned char *) strend)) > 0; + for (; + (chlen= cs->cset->mb_wc(cs, &wc, (uchar*) str, (uchar*) strend)) > 0; str+= chlen) { if (wc > 0x7F) |