diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-04 10:54:51 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-04 10:54:51 +0500 |
| commit | 1981008587319ee1190145ef651d31e29e75a22a (patch) | |
| tree | 9406811f25393f4adff4fd122803f0487faf92eb /strings/ctype-big5.c | |
| parent | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (diff) | |
| parent | db2d3104f90f398f81f5ab8fd7465f67cb950cce (diff) | |
| download | mariadb-git-1981008587319ee1190145ef651d31e29e75a22a.tar.gz | |
Merge mysql.com:/home/ram/work/b31070/b31070.4.1
into mysql.com:/home/ram/work/b31070/b31070.5.0
mysql-test/r/ctype_big5.result:
Auto merged
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
Diffstat (limited to 'strings/ctype-big5.c')
| -rw-r--r-- | strings/ctype-big5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 8bbbcac63e4..44b9951657d 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6271,12 +6271,12 @@ my_mb_wc_big5(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; |