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 | 86f3d2d08a3c46830d3c555d13171dcd53ac8039 (patch) | |
| tree | 53884b9ab5ed87409c40a2d1bb53db98dfacc7ef /include | |
| parent | c7df2c6a5819fe942ff68f90fe53a8e338ab9db6 (diff) | |
| parent | 1b58717cd85ee6fcc461c919075106a7d4ebd83b (diff) | |
| download | mariadb-git-86f3d2d08a3c46830d3c555d13171dcd53ac8039.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 '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 1ea4f85deed..216522f8a98 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -44,6 +44,7 @@ typedef struct unicase_info_st uint16 sort; } MY_UNICASE_INFO; + extern MY_UNICASE_INFO *my_unicase_default[256]; extern MY_UNICASE_INFO *my_unicase_turkish[256]; @@ -56,10 +57,18 @@ typedef struct uni_ctype_st extern MY_UNI_CTYPE my_uni_ctype[256]; -#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 |