diff options
| author | unknown <bar@mysql.com> | 2006-03-23 21:41:29 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-23 21:41:29 +0400 |
| commit | d4c8ca0ca79afd3dd34a8aea4e75e9a7c38bb626 (patch) | |
| tree | 31086b4c754c4f050e8464f92576444b649e76bb /strings | |
| parent | 378efca2be5a34244be4bbdb1f785abca214257a (diff) | |
| download | mariadb-git-d4c8ca0ca79afd3dd34a8aea4e75e9a7c38bb626.tar.gz | |
ctype-utf8.c, ctype-simple.c:
Forgot to include into the previous changeset.
strings/ctype-simple.c:
Forgot to include into the previous changeset.
strings/ctype-utf8.c:
Forgot to include into the previous changeset.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-simple.c | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 41ffecec266..7dd3dfca29a 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -1360,7 +1360,7 @@ int my_mb_ctype_8bit(CHARSET_INFO *cs, int *ctype, if (s >= e) { *ctype= 0; - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL; } *ctype= cs->ctype[*s]; return 1; diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 0c3c6c7cdc2..e3bba3ee1e3 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -3917,7 +3917,7 @@ my_mb_wc_filename(CHARSET_INFO *cs __attribute__((unused)), { int byte1, byte2; if (s >= e) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL; if (*s < 128 && filename_safe_char[*s]) { @@ -3929,7 +3929,7 @@ my_mb_wc_filename(CHARSET_INFO *cs __attribute__((unused)), return MY_CS_ILSEQ; if (s + 3 > e) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL3; byte1= s[1]; byte2= s[2]; @@ -3946,7 +3946,7 @@ my_mb_wc_filename(CHARSET_INFO *cs __attribute__((unused)), } if (s + 4 > e) - return MY_CS_TOOFEW(0); + return MY_CS_TOOSMALL4; if ((byte1= hexlo(byte1)) >= 0 && (byte2= hexlo(byte2)) >= 0) @@ -3977,7 +3977,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), } if (s + 3 > e) - return MY_CS_TOOSMALL; + return MY_CS_TOOSMALL3; *s++= MY_FILENAME_ESCAPE; if ((wc >= 0x00C0 && wc <= 0x05FF && (code= uni_0C00_05FF[wc - 0x00C0])) || @@ -3993,7 +3993,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), /* Non letter */ if (s + 5 > e) - return MY_CS_TOOSMALL; + return MY_CS_TOOSMALL5; *s++= hex[(wc >> 12) & 15]; *s++= hex[(wc >> 8) & 15]; |