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 | |
| 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')
| -rw-r--r-- | strings/ctype-big5.c | 4 | ||||
| -rw-r--r-- | strings/ctype-euc_kr.c | 4 | ||||
| -rw-r--r-- | strings/ctype-gb2312.c | 4 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 4 |
4 files changed, 7 insertions, 9 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; diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index abaa8f1a516..0a67d4c0a54 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8613,12 +8613,12 @@ my_mb_wc_euc_kr(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; diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index 811394878d6..267299ace7f 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -5664,12 +5664,10 @@ my_mb_wc_gb2312(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e){ int hi; - hi=(int) s[0]; - if (s >= e) return MY_CS_TOOSMALL; - if (hi<0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 6a7c7d7c0a0..fa00919692f 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4526,12 +4526,12 @@ mb: static int my_mb_wc_sjis(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; |