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

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

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

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)
     {