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

into mysql.com:/home/hf/work/mysql-4.1.ssj

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.ssj
d63df3a3 · holyfoot@mysql.com · 2f9a28b4 · 1851a38b · d63df3a3 · d63df3a3
Commit d63df3a3 authored May 10, 2005 by holyfoot@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

strings/ctype-sjis.c strings/ctype-sjis.c +1 -1

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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

--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -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)
    {