diff options
| author | bar@mysql.com <> | 2006-03-23 12:41:28 +0400 |
|---|---|---|
| committer | bar@mysql.com <> | 2006-03-23 12:41:28 +0400 |
| commit | 1008146d86869a0c11e8bad638e81bb2e64c4f3e (patch) | |
| tree | fefc8015db210132d0d029a6d3c30bafda73dc37 /strings/ctype-sjis.c | |
| parent | a4d4ed9ec8d54a82b30f41b85343575a03433c0d (diff) | |
| parent | 9ac6e558d44706519561f9e1234044fa850737cc (diff) | |
| download | mariadb-git-1008146d86869a0c11e8bad638e81bb2e64c4f3e.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
into mysql.com:/usr/home/bar/mysql-5.0
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 398aea08b05..57d6d8bae2b 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; } |