summaryrefslogtreecommitdiff
path: root/strings/ctype-simple.c
diff options
context:
space:
mode:
authorbar@mysql.com <>2006-03-23 12:41:28 +0400
committerbar@mysql.com <>2006-03-23 12:41:28 +0400
commit1008146d86869a0c11e8bad638e81bb2e64c4f3e (patch)
treefefc8015db210132d0d029a6d3c30bafda73dc37 /strings/ctype-simple.c
parenta4d4ed9ec8d54a82b30f41b85343575a03433c0d (diff)
parent9ac6e558d44706519561f9e1234044fa850737cc (diff)
downloadmariadb-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-simple.c')
-rw-r--r--strings/ctype-simple.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index d6f2f0e5fe5..12ef77c59b1 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,