Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/hf/work/mysql-4.1.ssj
This commit is contained in:
holyfoot@mysql.com 2005-05-10 02:54:49 +05:00
commit d63df3a3d5
2 changed files with 2 additions and 1 deletions

View file

@ -75,6 +75,7 @@ hf@bisonxp.(none)
hf@deer.(none)
hf@deer.mysql.r18.ru
hf@genie.(none)
holyfoot@mysql.com
igor@hundin.mysql.fi
igor@linux.local
igor@rurik.mysql.com

View file

@ -4576,7 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)),
{
const char *b0= b;
*error= 0;
while (pos && b < e)
while (pos-- && b < e)
{
if ((uchar) b[0] < 128)
{