Commit 2a0948ef authored by gluh@gluh.mysql.r18.ru's avatar gluh@gluh.mysql.r18.ru

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0
parents bbe30db0 b4e78f39
...@@ -274,7 +274,7 @@ uint my_well_formed_len_mb(CHARSET_INFO *cs, ...@@ -274,7 +274,7 @@ uint my_well_formed_len_mb(CHARSET_INFO *cs,
my_wc_t wc; my_wc_t wc;
int mblen; int mblen;
if ((mblen= cs->cset->mb_wc(cs, &wc, (uchar*) b, (uchar*) e)) <0) if ((mblen= cs->cset->mb_wc(cs, &wc, (uchar*) b, (uchar*) e)) <= 0)
break; break;
b+= mblen; b+= mblen;
pos--; pos--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment