diff options
| author | unknown <bar@mysql.com> | 2006-03-23 12:41:28 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-23 12:41:28 +0400 |
| commit | 8c8e0567c7b093ef97835a0bb513d064ddbed325 (patch) | |
| tree | fefc8015db210132d0d029a6d3c30bafda73dc37 /include | |
| parent | 5b34888ce43ca76a8d1840f45e0452de1535a728 (diff) | |
| parent | a464e01713d19d358eb7feab2cfdf88bb274d5df (diff) | |
| download | mariadb-git-8c8e0567c7b093ef97835a0bb513d064ddbed325.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
into mysql.com:/usr/home/bar/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
sql/sql_string.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.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.
mysql-test/r/ctype_ujis.result:
After merge fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index b92fb676a2e..78657bd1084 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]; @@ -52,6 +53,19 @@ extern MY_UNICASE_INFO *my_unicase_turkish[256]; #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 |