Commit 3521daed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-mb.c:
  after merge fix
strings/ctype-simple.c:
  after merge fix
strings/ctype-ucs2.c:
  after merge fix
strings/ctype-ujis.c:
  after merge fix
strings/ctype-utf8.c:
  After merge fix
parents d66c9e50 f12ded49

strings/ctype-gbk.c

+1 −1
Original line number Diff line number Diff line
@@ -9969,7 +9969,7 @@ uint my_well_formed_len_gbk(CHARSET_INFO *cs __attribute__((unused)), 
      break;

    }

  }

  return b - b0;

  return (uint) (b - b0);

}

































strings/ctype-sjis.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -213,7 +213,7 @@ static int my_strnncoll_sjis_internal(CHARSET_INFO *cs,







      uint a_char= sjiscode(*a, *(a+1));









      uint b_char= sjiscode(*b, *(b+1));









      if (a_char != b_char)









	return a_char - b_char;









	return (int) a_char - (int) b_char;









      a += 2;









      b += 2;









    } else
































strings/ctype-simple.c



+4
−4




























File changed.
Contains only whitespace changes.