Commit 0f436b32 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/cw/mysql-4.1
parents a862ef73 73a49cf1

BUILD/check-cpu

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ case "$cpu_family--$model_name" in 
  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

    cpu_flag_old="pentium";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

strings/ctype-big5.c

+1 −1
Original line number Diff line number Diff line
@@ -6285,7 +6285,7 @@ uint my_well_formed_len_big5(CHARSET_INFO *cs __attribute__((unused)), 
  const char *emb= e - 1; /* Last possible end of an MB character */



  *error= 0;

  while (pos && b < e)

  while (pos-- && b < e)

  {

    if ((uchar) b[0] < 128)

    {

strings/ctype-cp932.c

+1 −1
Original line number Diff line number Diff line
@@ -5417,7 +5417,7 @@ uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)), 
{

  const char *b0= b;

  *error= 0;

  while (pos && b < e)

  while (pos-- && b < e)

  {

    /*

      Cast to int8 for extra safety.