~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to strings/ctype.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
328
328
  {
329
329
    my_wc_t wc;
330
330
    int chlen;
331
 
    for (; (chlen= cs->cset->mb_wc(cs, &wc, str, strend)) > 0; str+= chlen)
 
331
    for (;
 
332
         (chlen= cs->cset->mb_wc(cs, &wc, (uchar*) str, (uchar*) strend)) > 0;
 
333
         str+= chlen)
332
334
    {
333
335
      if (wc > 0x7F)
334
336
        return MY_REPERTOIRE_UNICODE30;