diff options
| author | unknown <istruewing@stella.local> | 2007-12-11 21:37:33 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-12-11 21:37:33 +0100 |
| commit | d1b4b680d134a77789dfa0896d9299965c0dc50f (patch) | |
| tree | 8d165ae75cc77a6c917c8dc41b75cb2ceb402ca8 /strings | |
| parent | 5d3d4a4187701887c8afe4fe0b111cc13cec5978 (diff) | |
| parent | 7a4a266dee1e930c2583217635137069b3709cf3 (diff) | |
| download | mariadb-git-d1b4b680d134a77789dfa0896d9299965c0dc50f.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/t/disabled.def:
Auto merged
sql/partition_info.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/r/func_misc.result:
SCCS merged
mysql-test/t/func_misc.test:
SCCS merged
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 a0ff0314246..c1aba0b35c6 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -5360,12 +5360,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; |