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

into mysql.com:/Users/kent/mysql/cw/mysql-4.1
This commit is contained in:
kent@mysql.com 2005-05-10 18:14:45 +02:00
commit c82c07dc03
3 changed files with 3 additions and 2 deletions

View file

@ -57,6 +57,7 @@ case "$cpu_family--$model_name" in
;; ;;
*Pentium*M*pro*) *Pentium*M*pro*)
cpu_flag="pentium-m"; cpu_flag="pentium-m";
cpu_flag_old="pentium";
;; ;;
*Athlon*64*) *Athlon*64*)
cpu_flag="athlon64"; cpu_flag="athlon64";

View file

@ -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 */ const char *emb= e - 1; /* Last possible end of an MB character */
*error= 0; *error= 0;
while (pos && b < e) while (pos-- && b < e)
{ {
if ((uchar) b[0] < 128) if ((uchar) b[0] < 128)
{ {

View file

@ -5417,7 +5417,7 @@ uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)),
{ {
const char *b0= b; const char *b0= b;
*error= 0; *error= 0;
while (pos && b < e) while (pos-- && b < e)
{ {
/* /*
Cast to int8 for extra safety. Cast to int8 for extra safety.