Commit 3db2d3d8 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/hf/work/mysql-5.0.clean


BitKeeper/etc/logging_ok:
  auto-union
strings/ctype-sjis.c:
  Auto merged
parents c90b0ab5 163b8bdc

strings/ctype-sjis.c

+1 −1
Original line number Diff line number Diff line
@@ -4591,7 +4591,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)

    {