diff options
| author | unknown <kent@mysql.com> | 2005-05-10 18:14:45 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-10 18:14:45 +0200 |
| commit | 0f436b32f1d3be82ebb6062b59c60cbc829be0e2 (patch) | |
| tree | 15bf2a0f22ab5bffceb035756bf9f9a59911b56a | |
| parent | a862ef73ae220939e97c52b14d26c120f1c9c196 (diff) | |
| parent | 73a49cf1c91eda0bc57cd6fa3288be4a19d51f9c (diff) | |
| download | mariadb-git-0f436b32f1d3be82ebb6062b59c60cbc829be0e2.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
| -rwxr-xr-x | BUILD/check-cpu | 1 | ||||
| -rw-r--r-- | strings/ctype-big5.c | 2 | ||||
| -rw-r--r-- | strings/ctype-cp932.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 3cce4b1ab3d..7619224314b 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -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"; diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 07b30205f89..52886116ff2 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -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) { diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index 0db38afa1f7..d9e3bbd5866 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -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. |