diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 14:35:15 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 14:35:15 +0400 |
| commit | d68d16bb3db00ca4bf09f785e0a39bfa2c202911 (patch) | |
| tree | 9a34538efdfd3c04c9f706aba37617fc04d67b06 /strings | |
| parent | b9c4817058ea791db0f623b7c50093296e475de2 (diff) | |
| parent | 3f42e6ff9b98ebefdb684c0370872cb98f3a5aa2 (diff) | |
| download | mariadb-git-d68d16bb3db00ca4bf09f785e0a39bfa2c202911.tar.gz | |
Merge mysql.com:/home/ram/work/b32726/b32726.5.0
into mysql.com:/home/ram/work/b32726/b32726.5.1
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
strings/ctype-cp932.c:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
Auto 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; |