diff options
| author | unknown <istruewing@stella.local> | 2007-12-11 17:09:43 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-12-11 17:09:43 +0100 |
| commit | cd34354e6c8d86d19fb397912d98803254bebaaf (patch) | |
| tree | 3d24c8f4f0325ffc59ec0c65b251a86363351a4d /strings | |
| parent | 9e5ed26076c1999f4437eca4a7ef133962f2e30f (diff) | |
| parent | 36486ee86c8ba3eddeaed752e5e0c87498502058 (diff) | |
| download | mariadb-git-cd34354e6c8d86d19fb397912d98803254bebaaf.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-amain
into stella.local:/home2/mydev/mysql-5.0-axmrg
mysql-test/r/func_misc.result:
Manual merge
mysql-test/t/func_misc.test:
Manual merge
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-cp932.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index 42325648037..48c217921b1 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -5359,12 +5359,12 @@ my_wc_mb_cp932(CHARSET_INFO *cs __attribute__((unused)), static int my_mb_wc_cp932(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e){ - int hi=s[0]; + int hi; if (s >= e) return MY_CS_TOOSMALL; - if (hi < 0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; |