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 | a7b26aa730af97621ad18b7a447ae83802e11a5b (patch) | |
| tree | 53884b9ab5ed87409c40a2d1bb53db98dfacc7ef /strings/ctype-simple.c | |
| parent | bea8e074fe61867078916a91cf77e2f9606702bd (diff) | |
| parent | 63fde46222422294b658cbacc35e2ffbc924776d (diff) | |
| download | mariadb-git-a7b26aa730af97621ad18b7a447ae83802e11a5b.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-simple.c')
| -rw-r--r-- | strings/ctype-simple.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 17d828b0ff5..41ffecec266 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -239,10 +239,10 @@ int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const unsigned char *end __attribute__((unused))) { if (str >= end) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL; *wc=cs->tab_to_uni[*str]; - return (!wc[0] && str[0]) ? MY_CS_ILSEQ : 1; + return (!wc[0] && str[0]) ? -1 : 1; } int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, |