diff options
author | unknown <bar@mysql.com> | 2006-03-23 14:29:43 +0400 |
---|---|---|
committer | unknown <bar@mysql.com> | 2006-03-23 14:29:43 +0400 |
commit | 278b83a84dd0f8c129f6a31fe32772c37ababe86 (patch) | |
tree | efccf5ca05b9432ec5ae0da53c26273dc6398723 /include | |
parent | 49d2b4f0616c62826452c4d8e36a79c78d080516 (diff) | |
parent | a464e01713d19d358eb7feab2cfdf88bb274d5df (diff) | |
download | mariadb-git-278b83a84dd0f8c129f6a31fe32772c37ababe86.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b15376
include/m_ctype.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/m_ctype.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index d6d2c4fe25b..cd1dac9dde8 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -44,10 +44,19 @@ typedef struct unicase_info_st uint16 sort; } MY_UNICASE_INFO; -#define MY_CS_ILSEQ 0 -#define MY_CS_ILUNI 0 -#define MY_CS_TOOSMALL -1 -#define MY_CS_TOOFEW(n) (-1-(n)) + +/* wm_wc and wc_mb return codes */ +#define MY_CS_ILSEQ 0 /* Wrong by sequence: wb_wc */ +#define MY_CS_ILUNI 0 /* Cannot encode Unicode to charset: wc_mb */ +#define MY_CS_TOOSMALL -101 /* Need at least one byte: wc_mb and mb_wc */ +#define MY_CS_TOOSMALL2 -102 /* Need at least two bytes: wc_mb and mb_wc */ +#define MY_CS_TOOSMALL3 -103 /* Need at least three bytes: wc_mb and mb_wc */ +/* These following three are currently not really used */ +#define MY_CS_TOOSMALL4 -104 /* Need at least 4 bytes: wc_mb and mb_wc */ +#define MY_CS_TOOSMALL5 -105 /* Need at least 5 bytes: wc_mb and mb_wc */ +#define MY_CS_TOOSMALL6 -106 /* Need at least 6 bytes: wc_mb and mb_wc */ +/* A helper macros for "need at least n bytes" */ +#define MY_CS_TOOSMALLN(n) (-100-(n)) #define MY_SEQ_INTTAIL 1 #define MY_SEQ_SPACES 2 |