Skip to content

M
MariaDB
Commit 6340c79c authored by bar@bar.udmsearch.izhnet.ru's avatar bar@bar.udmsearch.izhnet.ru
Browse files
Options

Renamed some charset related constant 

New fields in CHARSET_INFO for more nice SHOW CHARACTER SET
Dynamic charsets are now handled in faster way
SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too
parent c9cc3cce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 155 deletions
include/m_ctype.h
View file @ 6340c79c
...@@ -42,6 +42,14 @@ typedef struct unicase_info_st { ...@@ -42,6 +42,14 @@ typedef struct unicase_info_st {
#define MY_CS_TOOSMALL -1 #define MY_CS_TOOSMALL -1
#define MY_CS_TOOFEW(n) (-1-(n)) #define MY_CS_TOOFEW(n) (-1-(n))
/* My charsets_list flags */
#define MY_NO_SETS 0
#define MY_CS_COMPILED 1 /* compiled-in sets */
#define MY_CS_CONFIG 2 /* sets that have a *.conf file */
#define MY_CS_INDEX 4 /* sets listed in the Index file */
#define MY_CS_LOADED 8 /* sets that are currently loaded */
typedef struct my_uni_idx_st { typedef struct my_uni_idx_st {
uint16 from; uint16 from;
uint16 to; uint16 to;
...@@ -52,14 +60,16 @@ typedef struct my_uni_idx_st { ...@@ -52,14 +60,16 @@ typedef struct my_uni_idx_st {
typedef struct charset_info_st typedef struct charset_info_st
{ {
uint number; uint number;
uint state;
const char *name; const char *name;
const char *comment;
uchar *ctype; uchar *ctype;
uchar *to_lower; uchar *to_lower;
uchar *to_upper; uchar *to_upper;
uchar *sort_order; uchar *sort_order;
uint16 *tab_to_uni; uint16 *tab_to_uni;
MY_UNI_IDX *tab_from_uni; MY_UNI_IDX *tab_from_uni;
/* Collation routines */ /* Collation routines */
uint strxfrm_multiply; uint strxfrm_multiply;
int (*strnncoll)(struct charset_info_st *, int (*strnncoll)(struct charset_info_st *,
...@@ -107,6 +117,7 @@ extern CHARSET_INFO *system_charset_info; ...@@ -107,6 +117,7 @@ extern CHARSET_INFO *system_charset_info;
extern CHARSET_INFO *find_compiled_charset(uint cs_number); extern CHARSET_INFO *find_compiled_charset(uint cs_number);
extern CHARSET_INFO *find_compiled_charset_by_name(const char *name); extern CHARSET_INFO *find_compiled_charset_by_name(const char *name);
extern CHARSET_INFO compiled_charsets[]; extern CHARSET_INFO compiled_charsets[];
extern CHARSET_INFO all_charsets[256];
extern uint compiled_charset_number(const char *name); extern uint compiled_charset_number(const char *name);
extern const char *compiled_charset_name(uint charset_number); extern const char *compiled_charset_name(uint charset_number);
......
include/my_sys.h
View file @ 6340c79c
...@@ -105,13 +105,6 @@ extern int NEAR my_errno; /* Last error in mysys */ ...@@ -105,13 +105,6 @@ extern int NEAR my_errno; /* Last error in mysys */
#define MY_SEEK_CUR 1 #define MY_SEEK_CUR 1
#define MY_SEEK_END 2 #define MY_SEEK_END 2
/* My charsets_list flags */
#define MY_NO_SETS 0
#define MY_COMPILED_SETS 1 /* show compiled-in sets */
#define MY_CONFIG_SETS 2 /* sets that have a *.conf file */
#define MY_INDEX_SETS 4 /* all sets listed in the Index file */
#define MY_LOADED_SETS 8 /* the sets that are currently loaded */
/* Some constants */ /* Some constants */
#define MY_WAIT_FOR_USER_TO_FIX_PANIC 60 /* in seconds */ #define MY_WAIT_FOR_USER_TO_FIX_PANIC 60 /* in seconds */
#define MY_WAIT_GIVE_USER_A_MESSAGE 10 /* Every 10 times of prev */ #define MY_WAIT_GIVE_USER_A_MESSAGE 10 /* Every 10 times of prev */
......
libmysqld/lib_sql.cc
View file @ 6340c79c
...@@ -413,7 +413,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) ...@@ -413,7 +413,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)
mysql_server_end(); mysql_server_end();
return 1; return 1;
} }
charsets_list = list_charsets(MYF(MY_COMPILED_SETS|MY_CONFIG_SETS)); charsets_list = list_charsets(MYF(MY_CS_COMPILED|MY_CS_CONFIG));
/* Parameter for threads created for connections */ /* Parameter for threads created for connections */
(void) pthread_attr_init(&connection_attrib); (void) pthread_attr_init(&connection_attrib);
......
mysys/charset.c
View file @ 6340c79c
This diff is collapsed.
mysys/test_charset.c
View file @ 6340c79c
...@@ -77,11 +77,11 @@ int main(int argc, char **argv) { ...@@ -77,11 +77,11 @@ int main(int argc, char **argv) {
_print_csinfo(default_charset_info); _print_csinfo(default_charset_info);
fflush(stdout); fflush(stdout);
cs_list = list_charsets(MYF(MY_COMPILED_SETS | MY_CONFIG_SETS)); cs_list = list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG));
printf("LIST OF CHARSETS (compiled + *.conf):\n%s\n", cs_list); printf("LIST OF CHARSETS (compiled + *.conf):\n%s\n", cs_list);
my_free(cs_list,MYF(0)); my_free(cs_list,MYF(0));
cs_list = list_charsets(MYF(MY_INDEX_SETS | MY_LOADED_SETS)); cs_list = list_charsets(MYF(MY_CS_INDEX | MY_CS_LOADED));
printf("LIST OF CHARSETS (index + loaded):\n%s\n", cs_list); printf("LIST OF CHARSETS (index + loaded):\n%s\n", cs_list);
my_free(cs_list,MYF(0)); my_free(cs_list,MYF(0));
......
sql/mysqld.cc
View file @ 6340c79c
...@@ -1840,7 +1840,7 @@ int main(int argc, char **argv) ...@@ -1840,7 +1840,7 @@ int main(int argc, char **argv)
if (set_default_charset_by_name(default_charset, MYF(MY_WME))) if (set_default_charset_by_name(default_charset, MYF(MY_WME)))
exit( 1 ); exit( 1 );
charsets_list = list_charsets(MYF(MY_COMPILED_SETS|MY_CONFIG_SETS)); charsets_list = list_charsets(MYF(MY_CS_COMPILED|MY_CS_CONFIG));
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
if (opt_use_ssl) if (opt_use_ssl)
......
sql/sql_show.cc
View file @ 6340c79c
...@@ -1381,8 +1381,10 @@ int mysqld_show_charsets(THD *thd, const char *wild) ...@@ -1381,8 +1381,10 @@ int mysqld_show_charsets(THD *thd, const char *wild)
if (send_fields(thd,field_list,1)) if (send_fields(thd,field_list,1))
DBUG_RETURN(1); DBUG_RETURN(1);
for (cs=compiled_charsets ; cs->name ; cs++ ) for (cs=all_charsets ; cs < all_charsets+255 ; cs++ )
{ {
if (!cs->name)
continue;
if (!(wild && wild[0] && wild_case_compare(system_charset_info,cs->name,wild))) if (!(wild && wild[0] && wild_case_compare(system_charset_info,cs->name,wild)))
{ {
packet2.length(0); packet2.length(0);
......
strings/ctype.c
View file @ 6340c79c
...@@ -2805,8 +2805,10 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2805,8 +2805,10 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_latin1 #ifdef HAVE_CHARSET_latin1
{ {
8, /* number */ 8, /* number */
"latin1", /* name */ MY_CS_COMPILED, /* state */
"latin1", /* name */
"", /* comment */
ctype_latin1, ctype_latin1,
to_lower_latin1, to_lower_latin1,
to_upper_latin1, to_upper_latin1,
...@@ -2838,7 +2840,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2838,7 +2840,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_big5 #ifdef HAVE_CHARSET_big5
{ {
1, /* number */ 1, /* number */
MY_CS_COMPILED, /* state */
"big5", /* name */ "big5", /* name */
"", /* comment */
ctype_big5, ctype_big5,
to_lower_big5, to_lower_big5,
to_upper_big5, to_upper_big5,
...@@ -2870,7 +2874,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2870,7 +2874,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_cp1251 #ifdef HAVE_CHARSET_cp1251
{ {
14, /* number */ 14, /* number */
MY_CS_COMPILED, /* state */
"cp1251", /* name */ "cp1251", /* name */
"", /* comment */
ctype_cp1251, ctype_cp1251,
to_lower_cp1251, to_lower_cp1251,
to_upper_cp1251, to_upper_cp1251,
...@@ -2902,7 +2908,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2902,7 +2908,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_cp1257 #ifdef HAVE_CHARSET_cp1257
{ {
29, /* number */ 29, /* number */
MY_CS_COMPILED, /* state */
"cp1257", /* name */ "cp1257", /* name */
"", /* comment */
ctype_cp1257, ctype_cp1257,
to_lower_cp1257, to_lower_cp1257,
to_upper_cp1257, to_upper_cp1257,
...@@ -2934,7 +2942,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2934,7 +2942,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_croat #ifdef HAVE_CHARSET_croat
{ {
27, /* number */ 27, /* number */
MY_CS_COMPILED, /* state */
"croat", /* name */ "croat", /* name */
"", /* comment */
ctype_croat, ctype_croat,
to_lower_croat, to_lower_croat,
to_upper_croat, to_upper_croat,
...@@ -2966,7 +2976,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2966,7 +2976,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_czech #ifdef HAVE_CHARSET_czech
{ {
2, /* number */ 2, /* number */
MY_CS_COMPILED, /* state */
"czech", /* name */ "czech", /* name */
"", /* comment */
ctype_czech, ctype_czech,
to_lower_czech, to_lower_czech,
to_upper_czech, to_upper_czech,
...@@ -2998,7 +3010,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -2998,7 +3010,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_danish #ifdef HAVE_CHARSET_danish
{ {
15, /* number */ 15, /* number */
MY_CS_COMPILED, /* state */
"danish", /* name */ "danish", /* name */
"", /* comment */
ctype_danish, ctype_danish,
to_lower_danish, to_lower_danish,
to_upper_danish, to_upper_danish,
...@@ -3030,7 +3044,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3030,7 +3044,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_dec8 #ifdef HAVE_CHARSET_dec8
{ {
3, /* number */ 3, /* number */
MY_CS_COMPILED, /* state */
"dec8", /* name */ "dec8", /* name */
"", /* comment */
ctype_dec8, ctype_dec8,
to_lower_dec8, to_lower_dec8,
to_upper_dec8, to_upper_dec8,
...@@ -3062,7 +3078,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3062,7 +3078,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_dos #ifdef HAVE_CHARSET_dos
{ {
4, /* number */ 4, /* number */
MY_CS_COMPILED, /* state */
"dos", /* name */ "dos", /* name */
"", /* comment */
ctype_dos, ctype_dos,
to_lower_dos, to_lower_dos,
to_upper_dos, to_upper_dos,
...@@ -3094,7 +3112,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3094,7 +3112,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_estonia #ifdef HAVE_CHARSET_estonia
{ {
20, /* number */ 20, /* number */
MY_CS_COMPILED, /* state */
"estonia", /* name */ "estonia", /* name */
"", /* comment */
ctype_estonia, ctype_estonia,
to_lower_estonia, to_lower_estonia,
to_upper_estonia, to_upper_estonia,
...@@ -3126,7 +3146,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3126,7 +3146,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_euc_kr #ifdef HAVE_CHARSET_euc_kr
{ {
19, /* number */ 19, /* number */
MY_CS_COMPILED, /* state */
"euc_kr", /* name */ "euc_kr", /* name */
"", /* comment */
ctype_euc_kr, ctype_euc_kr,
to_lower_euc_kr, to_lower_euc_kr,
to_upper_euc_kr, to_upper_euc_kr,
...@@ -3158,7 +3180,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3158,7 +3180,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_gb2312 #ifdef HAVE_CHARSET_gb2312
{ {
24, /* number */ 24, /* number */
MY_CS_COMPILED, /* state */
"gb2312", /* name */ "gb2312", /* name */
"", /* comment */
ctype_gb2312, ctype_gb2312,
to_lower_gb2312, to_lower_gb2312,
to_upper_gb2312, to_upper_gb2312,
...@@ -3190,7 +3214,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3190,7 +3214,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_gbk #ifdef HAVE_CHARSET_gbk
{ {
28, /* number */ 28, /* number */
MY_CS_COMPILED, /* state */
"gbk", /* name */ "gbk", /* name */
"", /* comment */
ctype_gbk, ctype_gbk,
to_lower_gbk, to_lower_gbk,
to_upper_gbk, to_upper_gbk,
...@@ -3222,7 +3248,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3222,7 +3248,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_german1 #ifdef HAVE_CHARSET_german1
{ {
5, /* number */ 5, /* number */
MY_CS_COMPILED, /* state */
"german1", /* name */ "german1", /* name */
"", /* comment */
ctype_german1, ctype_german1,
to_lower_german1, to_lower_german1,
to_upper_german1, to_upper_german1,
...@@ -3254,7 +3282,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3254,7 +3282,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_greek #ifdef HAVE_CHARSET_greek
{ {
25, /* number */ 25, /* number */
MY_CS_COMPILED, /* state */
"greek", /* name */ "greek", /* name */
"", /* comment */
ctype_greek, ctype_greek,
to_lower_greek, to_lower_greek,
to_upper_greek, to_upper_greek,
...@@ -3286,7 +3316,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3286,7 +3316,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_hebrew #ifdef HAVE_CHARSET_hebrew
{ {
16, /* number */ 16, /* number */
MY_CS_COMPILED, /* state */
"hebrew", /* name */ "hebrew", /* name */
"", /* comment */
ctype_hebrew, ctype_hebrew,
to_lower_hebrew, to_lower_hebrew,
to_upper_hebrew, to_upper_hebrew,
...@@ -3318,7 +3350,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3318,7 +3350,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_hp8 #ifdef HAVE_CHARSET_hp8
{ {
6, /* number */ 6, /* number */
MY_CS_COMPILED, /* state */
"hp8", /* name */ "hp8", /* name */
"", /* comment */
ctype_hp8, ctype_hp8,
to_lower_hp8, to_lower_hp8,
to_upper_hp8, to_upper_hp8,
...@@ -3350,7 +3384,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3350,7 +3384,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_hungarian #ifdef HAVE_CHARSET_hungarian
{ {
21, /* number */ 21, /* number */
MY_CS_COMPILED, /* state */
"hungarian", /* name */ "hungarian", /* name */
"", /* comment */
ctype_hungarian, ctype_hungarian,
to_lower_hungarian, to_lower_hungarian,
to_upper_hungarian, to_upper_hungarian,
...@@ -3382,7 +3418,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3382,7 +3418,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_koi8_ru #ifdef HAVE_CHARSET_koi8_ru
{ {
7, /* number */ 7, /* number */
MY_CS_COMPILED, /* state */
"koi8_ru", /* name */ "koi8_ru", /* name */
"", /* comment */
ctype_koi8_ru, ctype_koi8_ru,
to_lower_koi8_ru, to_lower_koi8_ru,
to_upper_koi8_ru, to_upper_koi8_ru,
...@@ -3414,7 +3452,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3414,7 +3452,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_koi8_ukr #ifdef HAVE_CHARSET_koi8_ukr
{ {
22, /* number */ 22, /* number */
MY_CS_COMPILED, /* state */
"koi8_ukr", /* name */ "koi8_ukr", /* name */
"", /* comment */
ctype_koi8_ukr, ctype_koi8_ukr,
to_lower_koi8_ukr, to_lower_koi8_ukr,
to_upper_koi8_ukr, to_upper_koi8_ukr,
...@@ -3446,7 +3486,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3446,7 +3486,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_latin1_de #ifdef HAVE_CHARSET_latin1_de
{ {
31, /* number */ 31, /* number */
MY_CS_COMPILED, /* state */
"latin1_de", /* name */ "latin1_de", /* name */
"", /* comment */
ctype_latin1_de, ctype_latin1_de,
to_lower_latin1_de, to_lower_latin1_de,
to_upper_latin1_de, to_upper_latin1_de,
...@@ -3478,7 +3520,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3478,7 +3520,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_latin2 #ifdef HAVE_CHARSET_latin2
{ {
9, /* number */ 9, /* number */
MY_CS_COMPILED, /* state */
"latin2", /* name */ "latin2", /* name */
"", /* comment */
ctype_latin2, ctype_latin2,
to_lower_latin2, to_lower_latin2,
to_upper_latin2, to_upper_latin2,
...@@ -3510,7 +3554,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3510,7 +3554,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_latin5 #ifdef HAVE_CHARSET_latin5
{ {
30, /* number */ 30, /* number */
MY_CS_COMPILED, /* state */
"latin5", /* name */ "latin5", /* name */
"", /* comment */
ctype_latin5, ctype_latin5,
to_lower_latin5, to_lower_latin5,
to_upper_latin5, to_upper_latin5,
...@@ -3542,7 +3588,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3542,7 +3588,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_sjis #ifdef HAVE_CHARSET_sjis
{ {
13, /* number */ 13, /* number */
MY_CS_COMPILED, /* state */
"sjis", /* name */ "sjis", /* name */
"", /* comment */
ctype_sjis, ctype_sjis,
to_lower_sjis, to_lower_sjis,
to_upper_sjis, to_upper_sjis,
...@@ -3574,7 +3622,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3574,7 +3622,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_swe7 #ifdef HAVE_CHARSET_swe7
{ {
10, /* number */ 10, /* number */
MY_CS_COMPILED, /* state */
"swe7", /* name */ "swe7", /* name */
"", /* comment */
ctype_swe7, ctype_swe7,
to_lower_swe7, to_lower_swe7,
to_upper_swe7, to_upper_swe7,
...@@ -3606,7 +3656,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3606,7 +3656,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_tis620 #ifdef HAVE_CHARSET_tis620
{ {
18, /* number */ 18, /* number */
MY_CS_COMPILED, /* state */
"tis620", /* name */ "tis620", /* name */
"", /* comment */
ctype_tis620, ctype_tis620,
to_lower_tis620, to_lower_tis620,
to_upper_tis620, to_upper_tis620,
...@@ -3638,7 +3690,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3638,7 +3690,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_ucs2 #ifdef HAVE_CHARSET_ucs2
{ {
35, /* number */ 35, /* number */
MY_CS_COMPILED, /* state */
"ucs2", /* name */ "ucs2", /* name */
"", /* comment */
ctype_ucs2, /* ctype */ ctype_ucs2, /* ctype */
to_lower_ucs2, /* to_lower */ to_lower_ucs2, /* to_lower */
to_upper_ucs2, /* to_upper */ to_upper_ucs2, /* to_upper */
...@@ -3671,7 +3725,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3671,7 +3725,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_ujis #ifdef HAVE_CHARSET_ujis
{ {
12, /* number */ 12, /* number */
MY_CS_COMPILED, /* state */
"ujis", /* name */ "ujis", /* name */
"", /* comment */
ctype_ujis, ctype_ujis,
to_lower_ujis, to_lower_ujis,
to_upper_ujis, to_upper_ujis,
...@@ -3703,7 +3759,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3703,7 +3759,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_utf8 #ifdef HAVE_CHARSET_utf8
{ {
33, /* number */ 33, /* number */
MY_CS_COMPILED, /* state */
"utf8", /* name */ "utf8", /* name */
"", /* comment */
ctype_utf8, /* ctype */ ctype_utf8, /* ctype */
to_lower_utf8, /* to_lower */ to_lower_utf8, /* to_lower */
to_upper_utf8, /* to_upper */ to_upper_utf8, /* to_upper */
...@@ -3735,7 +3793,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3735,7 +3793,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_usa7 #ifdef HAVE_CHARSET_usa7
{ {
11, /* number */ 11, /* number */
MY_CS_COMPILED, /* state */
"usa7", /* name */ "usa7", /* name */
"", /* comment */
ctype_usa7, ctype_usa7,
to_lower_usa7, to_lower_usa7,
to_upper_usa7, to_upper_usa7,
...@@ -3767,7 +3827,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3767,7 +3827,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_win1250 #ifdef HAVE_CHARSET_win1250
{ {
26, /* number */ 26, /* number */
MY_CS_COMPILED, /* state */
"win1250", /* name */ "win1250", /* name */
"", /* comment */
ctype_win1250, ctype_win1250,
to_lower_win1250, to_lower_win1250,
to_upper_win1250, to_upper_win1250,
...@@ -3799,7 +3861,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3799,7 +3861,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_win1251ukr #ifdef HAVE_CHARSET_win1251ukr
{ {
23, /* number */ 23, /* number */
MY_CS_COMPILED, /* state */
"win1251ukr", /* name */ "win1251ukr", /* name */
"", /* comment */
ctype_win1251ukr, ctype_win1251ukr,
to_lower_win1251ukr, to_lower_win1251ukr,
to_upper_win1251ukr, to_upper_win1251ukr,
...@@ -3831,7 +3895,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3831,7 +3895,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_armscii8 #ifdef HAVE_CHARSET_armscii8
{ {
32, /* number */ 32, /* number */
MY_CS_COMPILED, /* state */
"armscii8", /* name */ "armscii8", /* name */
"", /* comment */
ctype_armscii8, ctype_armscii8,
to_lower_armscii8, to_lower_armscii8,
to_upper_armscii8, to_upper_armscii8,
...@@ -3863,7 +3929,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3863,7 +3929,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_win1251 #ifdef HAVE_CHARSET_win1251
{ {
17, /* number */ 17, /* number */
MY_CS_COMPILED, /* state */
"win1251", /* name */ "win1251", /* name */
"", /* comment */
ctype_win1251, ctype_win1251,
to_lower_win1251, to_lower_win1251,
to_upper_win1251, to_upper_win1251,
...@@ -3895,7 +3963,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3895,7 +3963,9 @@ CHARSET_INFO compiled_charsets[] = {
#ifdef HAVE_CHARSET_win1250ch #ifdef HAVE_CHARSET_win1250ch
{ {
34, /* number */ 34, /* number */
MY_CS_COMPILED, /* state */
"win1250ch", /* name */ "win1250ch", /* name */
"", /* comment */
ctype_win1250ch, ctype_win1250ch,
to_lower_win1250ch, to_lower_win1250ch,
to_upper_win1250ch, to_upper_win1250ch,
...@@ -3926,7 +3996,9 @@ CHARSET_INFO compiled_charsets[] = { ...@@ -3926,7 +3996,9 @@ CHARSET_INFO compiled_charsets[] = {
{ {
0, /* end-of-list marker */ 0, /* end-of-list marker */
NullS, 0, /* state */
NullS, /* name */
NullS, /* comment */
NULL, NULL,
NULL, NULL,
NULL, NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7