diff options
| author | istruewing@stella.local <> | 2007-12-11 21:37:33 +0100 |
|---|---|---|
| committer | istruewing@stella.local <> | 2007-12-11 21:37:33 +0100 |
| commit | 03d99c595695fee897e66d7fb83a6b62603c934d (patch) | |
| tree | 8d165ae75cc77a6c917c8dc41b75cb2ceb402ca8 /strings | |
| parent | ffa270d616509cf12727ee26f2986462c2319173 (diff) | |
| parent | 71160422ee4ebccac974ff4a42934dafcaf56449 (diff) | |
| download | mariadb-git-03d99c595695fee897e66d7fb83a6b62603c934d.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
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; |