diff options
| author | unknown <bar@mysql.com> | 2006-03-23 14:14:32 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-23 14:14:32 +0400 |
| commit | 86f3d2d08a3c46830d3c555d13171dcd53ac8039 (patch) | |
| tree | 53884b9ab5ed87409c40a2d1bb53db98dfacc7ef /strings/ctype-sjis.c | |
| parent | c7df2c6a5819fe942ff68f90fe53a8e338ab9db6 (diff) | |
| parent | 1b58717cd85ee6fcc461c919075106a7d4ebd83b (diff) | |
| download | mariadb-git-86f3d2d08a3c46830d3c555d13171dcd53ac8039.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-cp932.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-eucjpms.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
include/m_ctype.h:
After merge fix.
Diffstat (limited to 'strings/ctype-sjis.c')
| -rw-r--r-- | strings/ctype-sjis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index bf70b4a05db..59156e444c1 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4516,7 +4516,7 @@ my_wc_mb_sjis(CHARSET_INFO *cs __attribute__((unused)), mb: if (s+2>e) - return MY_CS_TOOSMALL; + return MY_CS_TOOSMALL2; s[0]=code>>8; s[1]=code&0xFF; @@ -4530,7 +4530,7 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)), int hi=s[0]; if (s >= e) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL; if (hi < 0x80) { @@ -4545,10 +4545,10 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)), } if (s+2>e) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL2; if (!(pwc[0]=func_sjis_uni_onechar((hi<<8)+s[1]))) - return MY_CS_ILSEQ; + return -2; return 2; } |