diff options
| author | Alexander Barkov <bar@mariadb.com> | 2023-02-21 11:03:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2023-02-21 11:07:25 +0400 |
| commit | 7e341cc7408eca81bd9bad4080df74e6d6fe21a3 (patch) | |
| tree | 5189d17beceb5f6c1ebd0d8d889e60202c6cf7a2 /strings | |
| parent | 7f6b648d7db895c09a6ace3b5ee62a5fb482a8e0 (diff) | |
| download | mariadb-git-7e341cc7408eca81bd9bad4080df74e6d6fe21a3.tar.gz | |
MDEV-30692 conf_to_src is not up to date
Fixing conf_to_src.c according to changes made by
a206658b985fe5e18fb5692fdb3698dad5aca70a
Re-generating ctype-extra.c at once, to fix the indentation
from manually edited to automatic.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/conf_to_src.c | 87 | ||||
| -rw-r--r-- | strings/ctype-extra.c | 432 |
2 files changed, 266 insertions, 253 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index b4999ef7278..22b9cda058a 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -78,7 +78,7 @@ static uint get_collation_number(const char *name) cs < all_charsets + array_elements(all_charsets); cs++) { - if (cs->name && !strcmp(cs->name, name)) + if (cs->coll_name.str && !strcmp(cs->coll_name.str, name)) return cs->number; } return 0; @@ -93,8 +93,8 @@ get_charset_number_internal(const char *charset_name, uint cs_flags) cs < all_charsets + array_elements(all_charsets); cs++) { - if (cs->csname && (cs->state & cs_flags) && - !strcmp(cs->csname, charset_name)) + if (cs->cs_name.str && (cs->state & cs_flags) && + !strcmp(cs->cs_name.str, charset_name)) return cs->number; } return 0; @@ -114,17 +114,23 @@ static void simple_cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from) to->number= from->number ? from->number : to->number; to->state|= from->state; - if (from->csname) - to->csname= strdup(from->csname); + if (from->cs_name.str) + { + to->cs_name.str= strndup(from->cs_name.str, from->cs_name.length); + to->cs_name.length= from->cs_name.length; + } - if (from->name) - to->name= strdup(from->name); + if (from->coll_name.str) + { + to->coll_name.str= strndup(from->coll_name.str, from->coll_name.length); + to->coll_name.length= from->coll_name.length; + } if (from->tailoring) to->tailoring= strdup(from->tailoring); - if (from->ctype) - to->ctype= (uchar*) mdup((char*) from->ctype, MY_CS_CTYPE_TABLE_SIZE); + if (from->m_ctype) + to->m_ctype= (uchar*) mdup((char*) from->m_ctype, MY_CS_CTYPE_TABLE_SIZE); if (from->to_lower) to->to_lower= (uchar*) mdup((char*) from->to_lower, MY_CS_TO_LOWER_TABLE_SIZE); if (from->to_upper) @@ -160,9 +166,9 @@ static void inherit_charset_data(struct charset_info_st *cs, CHARSET_INFO *refcs) { cs->state|= (refcs->state & (MY_CS_PUREASCII|MY_CS_NONASCII)); - if (refcs->ctype && cs->ctype && - !memcmp(cs->ctype, refcs->ctype, MY_CS_CTYPE_TABLE_SIZE)) - cs->ctype= NULL; + if (refcs->m_ctype && cs->m_ctype && + !memcmp(cs->m_ctype, refcs->m_ctype, MY_CS_CTYPE_TABLE_SIZE)) + cs->m_ctype= NULL; if (refcs->to_lower && cs->to_lower && !memcmp(cs->to_lower, refcs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE)) cs->to_lower= NULL; @@ -179,7 +185,7 @@ static void inherit_charset_data(struct charset_info_st *cs, static CHARSET_INFO *find_charset_data_inheritance_source(CHARSET_INFO *cs) { CHARSET_INFO *refcs; - uint refid= get_charset_number_internal(cs->csname, MY_CS_PRIMARY); + uint refid= get_charset_number_internal(cs->cs_name.str, MY_CS_PRIMARY); return refid && refid != cs->number && (refcs= &all_charsets[refid]) && (refcs->state & MY_CS_LOADED) ? refcs : NULL; @@ -197,16 +203,16 @@ static CHARSET_INFO *find_charset_data_inheritance_source(CHARSET_INFO *cs) */ static my_bool simple_cs_is_full(CHARSET_INFO *cs) { - return ((cs->csname && cs->tab_to_uni && cs->ctype && cs->to_upper && + return ((cs->cs_name.str && cs->tab_to_uni && cs->m_ctype && cs->to_upper && cs->to_lower) && - (cs->number && cs->name && + (cs->number && cs->coll_name.str && (cs->sort_order || cs->tailoring || (cs->state & MY_CS_BINSORT)))); } static int add_collation(struct charset_info_st *cs) { - if (cs->name && - (cs->number || (cs->number= get_collation_number(cs->name)))) + if (cs->coll_name.str && + (cs->number || (cs->number= get_collation_number(cs->coll_name.str)))) { if (!(all_charsets[cs->number].state & MY_CS_COMPILED)) { @@ -215,7 +221,8 @@ static int add_collation(struct charset_info_st *cs) } cs->number= 0; - cs->name= NULL; + cs->coll_name.str= 0; + cs->coll_name.length= 0; cs->tailoring= NULL; cs->state= 0; cs->sort_order= NULL; @@ -276,16 +283,16 @@ static int my_read_charset_file(const char *filename) void print_arrays(FILE *f, CHARSET_INFO *cs) { - if (cs->ctype) - print_array(f, cs->name, "ctype", cs->ctype, MY_CS_CTYPE_TABLE_SIZE); + if (cs->m_ctype) + print_array(f, cs->coll_name.str, "ctype", cs->m_ctype, MY_CS_CTYPE_TABLE_SIZE); if (cs->to_lower) - print_array(f, cs->name, "to_lower", cs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE); + print_array(f, cs->coll_name.str, "to_lower", cs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE); if (cs->to_upper) - print_array(f, cs->name, "to_upper", cs->to_upper, MY_CS_TO_UPPER_TABLE_SIZE); + print_array(f, cs->coll_name.str, "to_upper", cs->to_upper, MY_CS_TO_UPPER_TABLE_SIZE); if (cs->sort_order) - print_array(f, cs->name, "sort_order", cs->sort_order, MY_CS_SORT_ORDER_TABLE_SIZE); + print_array(f, cs->coll_name.str, "sort_order", cs->sort_order, MY_CS_SORT_ORDER_TABLE_SIZE); if (cs->tab_to_uni) - print_array16(f, cs->name, "to_uni", cs->tab_to_uni, MY_CS_TO_UNI_TABLE_SIZE); + print_array16(f, cs->coll_name.str, "to_uni", cs->tab_to_uni, MY_CS_TO_UNI_TABLE_SIZE); } @@ -332,7 +339,7 @@ print_array_ref(FILE *f, CHARSET_INFO *cs= array0 ? cs0 : array1 ? cs1 : NULL; if (cs) fprintf(f," %s_%s, /* %s */\n", - name, cs->name, name); + name, cs->coll_name.str, name); else fprintf(f," NULL, /* %s */\n", name); } @@ -344,6 +351,12 @@ static const char *nopad_infix(CHARSET_INFO *cs) } +void fprintf_lex_str_member(FILE *f, const LEX_CSTRING str, const char *comment) +{ + fprintf(f," { STRING_WITH_LEN(\"%s\") }, %s\n", str.str, comment); +} + + void dispcset(FILE *f,CHARSET_INFO *cs) { fprintf(f,"{\n"); @@ -356,23 +369,23 @@ void dispcset(FILE *f,CHARSET_INFO *cs) cs->state & MY_CS_NONASCII ? "|MY_CS_NONASCII" : "", cs->state & MY_CS_NOPAD ? "|MY_CS_NOPAD" : ""); - if (cs->name) + if (cs->coll_name.str) { CHARSET_INFO *srccs= inheritance_source(cs->number); - fprintf(f," \"%s\", /* cset name */\n",cs->csname); - fprintf(f," \"%s\", /* coll name */\n",cs->name); + fprintf_lex_str_member(f, cs->cs_name, "/* cset name */"); + fprintf_lex_str_member(f, cs->coll_name, "/* coll name */"); fprintf(f," \"\", /* comment */\n"); if (cs->tailoring) fprintf(f, " \"%s\", /* tailoring */\n", cs->tailoring); else fprintf(f," NULL, /* tailoring */\n"); - print_array_ref(f, cs, cs->ctype, srccs, srccs->ctype, "ctype"); + print_array_ref(f, cs, cs->m_ctype, srccs, srccs->m_ctype, "ctype"); print_array_ref(f, cs, cs->to_lower, srccs, srccs->to_lower, "to_lower"); print_array_ref(f, cs, cs->to_upper, srccs, srccs->to_upper, "to_upper"); if (cs->sort_order) - fprintf(f," sort_order_%s, /* sort_order */\n",cs->name); + fprintf(f," sort_order_%s, /* sort_order */\n", cs->coll_name.str); else fprintf(f," NULL, /* sort_order */\n"); @@ -382,8 +395,8 @@ void dispcset(FILE *f,CHARSET_INFO *cs) } else { - fprintf(f," NULL, /* cset name */\n"); - fprintf(f," NULL, /* coll name */\n"); + fprintf(f," {NULL,0}, /* cset name */\n"); + fprintf(f," {NULL,0}, /* coll name */\n"); fprintf(f," NULL, /* comment */\n"); fprintf(f," NULL, /* tailoging */\n"); fprintf(f," NULL, /* ctype */\n"); @@ -422,7 +435,7 @@ fprint_copyright(FILE *file) fprintf(file, "/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n" " Copyright (c) 2000, 2011, Oracle and/or its affiliates.\n" -" Copyright 2008-2016 MariaDB Corporation\n" +" Copyright 2008-2023 MariaDB Corporation\n" "\n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms of the GNU General Public License as published by\n" @@ -466,9 +479,9 @@ main(int argc, char **argv __attribute__((unused))) { if (cs->number && !(cs->state & MY_CS_COMPILED)) { - if ( (!simple_cs_is_full(cs)) && (cs->csname)) + if ( (!simple_cs_is_full(cs)) && (cs->cs_name.str)) { - sprintf(filename,"%s/%s.xml",argv[1],cs->csname); + sprintf(filename,"%s/%s.xml",argv[1], cs->cs_name.str); my_read_charset_file(filename); } cs->state|= MY_CS_LOADED; @@ -502,7 +515,7 @@ main(int argc, char **argv __attribute__((unused))) refids[cs->number]= refcs->number; inherit_charset_data(cs, refcs); } - fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname); + fprintf(f,"#ifdef HAVE_CHARSET_%s\n", cs->cs_name.str); print_arrays(f, cs); fprintf(f,"#endif\n"); fprintf(f,"\n"); @@ -516,7 +529,7 @@ main(int argc, char **argv __attribute__((unused))) { if (cs->state & MY_CS_LOADED) { - fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname); + fprintf(f,"#ifdef HAVE_CHARSET_%s\n", cs->cs_name.str); dispcset(f,cs); fprintf(f,",\n"); fprintf(f,"#endif\n"); diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c index 00409f8bc15..e3ade69d522 100644 --- a/strings/ctype-extra.c +++ b/strings/ctype-extra.c @@ -8,7 +8,7 @@ /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright 2008-2016 MariaDB Corporation + Copyright 2008-2023 MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3678,8 +3678,8 @@ struct charset_info_st compiled_charsets[] = { { 3,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("dec8") }, /* cset name */ - { STRING_WITH_LEN("dec8_swedish_ci") }, /* coll name */ + { STRING_WITH_LEN("dec8") }, /* cset name */ + { STRING_WITH_LEN("dec8_swedish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_dec8_swedish_ci, /* ctype */ @@ -3709,8 +3709,8 @@ struct charset_info_st compiled_charsets[] = { { 4,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp850") }, /* cset name */ - { STRING_WITH_LEN("cp850_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp850") }, /* cset name */ + { STRING_WITH_LEN("cp850_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp850_general_ci, /* ctype */ @@ -3740,9 +3740,9 @@ struct charset_info_st compiled_charsets[] = { { 5,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin1") }, /* cset name */ - { STRING_WITH_LEN("latin1_german1_ci") }, /* coll name */ - "", /* comment */ + { STRING_WITH_LEN("latin1") }, /* cset name */ + { STRING_WITH_LEN("latin1_german1_ci") }, /* coll name */ + "", /* comment */ NULL, /* tailoring */ ctype_latin1_german1_ci, /* ctype */ to_lower_latin1_german1_ci, /* to_lower */ @@ -3771,8 +3771,8 @@ struct charset_info_st compiled_charsets[] = { { 6,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("hp8") }, /* cset name */ - { STRING_WITH_LEN("hp8_english_ci") }, /* coll name */ + { STRING_WITH_LEN("hp8") }, /* cset name */ + { STRING_WITH_LEN("hp8_english_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hp8_english_ci, /* ctype */ @@ -3802,8 +3802,8 @@ struct charset_info_st compiled_charsets[] = { { 7,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("koi8r") }, /* cset name */ - { STRING_WITH_LEN("koi8r_general_ci") }, /* coll name */ + { STRING_WITH_LEN("koi8r") }, /* cset name */ + { STRING_WITH_LEN("koi8r_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8r_general_ci, /* ctype */ @@ -3833,8 +3833,8 @@ struct charset_info_st compiled_charsets[] = { { 9,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_general_ci")}, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -3864,8 +3864,8 @@ struct charset_info_st compiled_charsets[] = { { 10,0,0, MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_NONASCII, - { STRING_WITH_LEN("swe7") }, /* cset name */ - { STRING_WITH_LEN("swe7_swedish_ci") }, /* coll name */ + { STRING_WITH_LEN("swe7") }, /* cset name */ + { STRING_WITH_LEN("swe7_swedish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_swe7_swedish_ci, /* ctype */ @@ -3895,8 +3895,8 @@ struct charset_info_st compiled_charsets[] = { { 11,0,0, MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_PUREASCII, - { STRING_WITH_LEN("ascii") }, /* cset name */ - { STRING_WITH_LEN("ascii_general_ci") }, /* coll name */ + { STRING_WITH_LEN("ascii") }, /* cset name */ + { STRING_WITH_LEN("ascii_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_ascii_general_ci, /* ctype */ @@ -3926,8 +3926,8 @@ struct charset_info_st compiled_charsets[] = { { 14,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_bulgarian_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_bulgarian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -3957,8 +3957,8 @@ struct charset_info_st compiled_charsets[] = { { 15,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin1") }, /* cset name */ - { STRING_WITH_LEN("latin1_danish_ci") }, /* coll name */ + { STRING_WITH_LEN("latin1") }, /* cset name */ + { STRING_WITH_LEN("latin1_danish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin1_danish_ci, /* ctype */ @@ -3988,8 +3988,8 @@ struct charset_info_st compiled_charsets[] = { { 16,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("hebrew") }, /* cset name */ - { STRING_WITH_LEN("hebrew_general_ci") }, /* coll name */ + { STRING_WITH_LEN("hebrew") }, /* cset name */ + { STRING_WITH_LEN("hebrew_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hebrew_general_ci, /* ctype */ @@ -4019,8 +4019,8 @@ struct charset_info_st compiled_charsets[] = { { 20,0,0, MY_CS_COMPILED|MY_CS_CSSORT, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_estonian_cs") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_estonian_cs") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -4050,8 +4050,8 @@ struct charset_info_st compiled_charsets[] = { { 21,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_hungarian_ci") }, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_hungarian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -4081,8 +4081,8 @@ struct charset_info_st compiled_charsets[] = { { 22,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("koi8u") }, /* cset name */ - { STRING_WITH_LEN("koi8u_general_ci") }, /* coll name */ + { STRING_WITH_LEN("koi8u") }, /* cset name */ + { STRING_WITH_LEN("koi8u_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8u_general_ci, /* ctype */ @@ -4112,8 +4112,8 @@ struct charset_info_st compiled_charsets[] = { { 23,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_ukrainian_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_ukrainian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -4143,8 +4143,8 @@ struct charset_info_st compiled_charsets[] = { { 25,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("greek") }, /* cset name */ - { STRING_WITH_LEN("greek_general_ci") }, /* coll name */ + { STRING_WITH_LEN("greek") }, /* cset name */ + { STRING_WITH_LEN("greek_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_greek_general_ci, /* ctype */ @@ -4174,8 +4174,8 @@ struct charset_info_st compiled_charsets[] = { { 26,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -4205,8 +4205,8 @@ struct charset_info_st compiled_charsets[] = { { 27,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_croatian_ci") }, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_croatian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -4236,8 +4236,8 @@ struct charset_info_st compiled_charsets[] = { { 29,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("cp1257") }, /* cset name */ - { STRING_WITH_LEN("cp1257_lithuanian_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1257") }, /* cset name */ + { STRING_WITH_LEN("cp1257_lithuanian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1257_general_ci, /* ctype */ @@ -4267,8 +4267,8 @@ struct charset_info_st compiled_charsets[] = { { 30,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("latin5") }, /* cset name */ - { STRING_WITH_LEN("latin5_turkish_ci") }, /* coll name */ + { STRING_WITH_LEN("latin5") }, /* cset name */ + { STRING_WITH_LEN("latin5_turkish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin5_turkish_ci, /* ctype */ @@ -4298,8 +4298,8 @@ struct charset_info_st compiled_charsets[] = { { 32,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("armscii8") }, /* cset name */ - { STRING_WITH_LEN("armscii8_general_ci") }, /* coll name */ + { STRING_WITH_LEN("armscii8") }, /* cset name */ + { STRING_WITH_LEN("armscii8_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_armscii8_general_ci, /* ctype */ @@ -4329,8 +4329,8 @@ struct charset_info_st compiled_charsets[] = { { 36,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp866") }, /* cset name */ - { STRING_WITH_LEN("cp866_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp866") }, /* cset name */ + { STRING_WITH_LEN("cp866_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp866_general_ci, /* ctype */ @@ -4360,8 +4360,8 @@ struct charset_info_st compiled_charsets[] = { { 37,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("keybcs2") }, /* cset name */ - { STRING_WITH_LEN("keybcs2_general_ci") }, /* coll name */ + { STRING_WITH_LEN("keybcs2") }, /* cset name */ + { STRING_WITH_LEN("keybcs2_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_keybcs2_general_ci, /* ctype */ @@ -4391,8 +4391,8 @@ struct charset_info_st compiled_charsets[] = { { 38,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("macce") }, /* cset name */ - { STRING_WITH_LEN("macce_general_ci") }, /* coll name */ + { STRING_WITH_LEN("macce") }, /* cset name */ + { STRING_WITH_LEN("macce_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macce_general_ci, /* ctype */ @@ -4422,8 +4422,8 @@ struct charset_info_st compiled_charsets[] = { { 39,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("macroman") }, /* cset name */ - { STRING_WITH_LEN("macroman_general_ci") }, /* coll name */ + { STRING_WITH_LEN("macroman") }, /* cset name */ + { STRING_WITH_LEN("macroman_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macroman_general_ci, /* ctype */ @@ -4453,8 +4453,8 @@ struct charset_info_st compiled_charsets[] = { { 40,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp852") }, /* cset name */ - { STRING_WITH_LEN("cp852_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp852") }, /* cset name */ + { STRING_WITH_LEN("cp852_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp852_general_ci, /* ctype */ @@ -4484,8 +4484,8 @@ struct charset_info_st compiled_charsets[] = { { 41,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_general_ci") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -4515,8 +4515,8 @@ struct charset_info_st compiled_charsets[] = { { 42,0,0, MY_CS_COMPILED|MY_CS_CSSORT, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_general_cs") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_general_cs") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -4546,8 +4546,8 @@ struct charset_info_st compiled_charsets[] = { { 43,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("macce") }, /* cset name */ - { STRING_WITH_LEN("macce_bin") }, /* coll name */ + { STRING_WITH_LEN("macce") }, /* cset name */ + { STRING_WITH_LEN("macce_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macce_general_ci, /* ctype */ @@ -4577,8 +4577,8 @@ struct charset_info_st compiled_charsets[] = { { 44,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_croatian_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_croatian_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -4608,8 +4608,8 @@ struct charset_info_st compiled_charsets[] = { { 48,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin1") }, /* cset name */ - { STRING_WITH_LEN("latin1_general_ci") }, /* coll name */ + { STRING_WITH_LEN("latin1") }, /* cset name */ + { STRING_WITH_LEN("latin1_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin1_general_ci, /* ctype */ @@ -4639,8 +4639,8 @@ struct charset_info_st compiled_charsets[] = { { 49,0,0, MY_CS_COMPILED|MY_CS_CSSORT, - { STRING_WITH_LEN("latin1") }, /* cset name */ - { STRING_WITH_LEN("latin1_general_cs") }, /* coll name */ + { STRING_WITH_LEN("latin1") }, /* cset name */ + { STRING_WITH_LEN("latin1_general_cs") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin1_general_cs, /* ctype */ @@ -4670,8 +4670,8 @@ struct charset_info_st compiled_charsets[] = { { 50,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -4701,8 +4701,8 @@ struct charset_info_st compiled_charsets[] = { { 51,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -4732,8 +4732,8 @@ struct charset_info_st compiled_charsets[] = { { 52,0,0, MY_CS_COMPILED|MY_CS_CSSORT, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_general_cs") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_general_cs") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -4763,8 +4763,8 @@ struct charset_info_st compiled_charsets[] = { { 53,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("macroman") }, /* cset name */ - { STRING_WITH_LEN("macroman_bin") }, /* coll name */ + { STRING_WITH_LEN("macroman") }, /* cset name */ + { STRING_WITH_LEN("macroman_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macroman_general_ci, /* ctype */ @@ -4794,8 +4794,8 @@ struct charset_info_st compiled_charsets[] = { { 57,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp1256") }, /* cset name */ - { STRING_WITH_LEN("cp1256_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1256") }, /* cset name */ + { STRING_WITH_LEN("cp1256_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1256_general_ci, /* ctype */ @@ -4825,8 +4825,8 @@ struct charset_info_st compiled_charsets[] = { { 58,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp1257") }, /* cset name */ - { STRING_WITH_LEN("cp1257_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1257") }, /* cset name */ + { STRING_WITH_LEN("cp1257_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1257_general_ci, /* ctype */ @@ -4856,8 +4856,8 @@ struct charset_info_st compiled_charsets[] = { { 59,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("cp1257") }, /* cset name */ - { STRING_WITH_LEN("cp1257_general_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1257") }, /* cset name */ + { STRING_WITH_LEN("cp1257_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1257_general_ci, /* ctype */ @@ -4887,8 +4887,8 @@ struct charset_info_st compiled_charsets[] = { { 64,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("armscii8") }, /* cset name */ - { STRING_WITH_LEN("armscii8_bin") }, /* coll name */ + { STRING_WITH_LEN("armscii8") }, /* cset name */ + { STRING_WITH_LEN("armscii8_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_armscii8_general_ci, /* ctype */ @@ -4918,8 +4918,8 @@ struct charset_info_st compiled_charsets[] = { { 65,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PUREASCII, - { STRING_WITH_LEN("ascii") }, /* cset name */ - { STRING_WITH_LEN("ascii_bin") }, /* coll name */ + { STRING_WITH_LEN("ascii") }, /* cset name */ + { STRING_WITH_LEN("ascii_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_ascii_general_ci, /* ctype */ @@ -4949,8 +4949,8 @@ struct charset_info_st compiled_charsets[] = { { 66,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -4980,8 +4980,8 @@ struct charset_info_st compiled_charsets[] = { { 67,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp1256") }, /* cset name */ - { STRING_WITH_LEN("cp1256_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1256") }, /* cset name */ + { STRING_WITH_LEN("cp1256_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1256_general_ci, /* ctype */ @@ -5011,8 +5011,8 @@ struct charset_info_st compiled_charsets[] = { { 68,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp866") }, /* cset name */ - { STRING_WITH_LEN("cp866_bin") }, /* coll name */ + { STRING_WITH_LEN("cp866") }, /* cset name */ + { STRING_WITH_LEN("cp866_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp866_general_ci, /* ctype */ @@ -5042,8 +5042,8 @@ struct charset_info_st compiled_charsets[] = { { 69,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("dec8") }, /* cset name */ - { STRING_WITH_LEN("dec8_bin") }, /* coll name */ + { STRING_WITH_LEN("dec8") }, /* cset name */ + { STRING_WITH_LEN("dec8_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_dec8_swedish_ci, /* ctype */ @@ -5073,8 +5073,8 @@ struct charset_info_st compiled_charsets[] = { { 70,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("greek") }, /* cset name */ - { STRING_WITH_LEN("greek_bin") }, /* coll name */ + { STRING_WITH_LEN("greek") }, /* cset name */ + { STRING_WITH_LEN("greek_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_greek_general_ci, /* ctype */ @@ -5104,8 +5104,8 @@ struct charset_info_st compiled_charsets[] = { { 71,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("hebrew") }, /* cset name */ - { STRING_WITH_LEN("hebrew_bin") }, /* coll name */ + { STRING_WITH_LEN("hebrew") }, /* cset name */ + { STRING_WITH_LEN("hebrew_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hebrew_general_ci, /* ctype */ @@ -5135,8 +5135,8 @@ struct charset_info_st compiled_charsets[] = { { 72,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("hp8") }, /* cset name */ - { STRING_WITH_LEN("hp8_bin") }, /* coll name */ + { STRING_WITH_LEN("hp8") }, /* cset name */ + { STRING_WITH_LEN("hp8_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hp8_english_ci, /* ctype */ @@ -5166,8 +5166,8 @@ struct charset_info_st compiled_charsets[] = { { 73,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("keybcs2") }, /* cset name */ - { STRING_WITH_LEN("keybcs2_bin") }, /* coll name */ + { STRING_WITH_LEN("keybcs2") }, /* cset name */ + { STRING_WITH_LEN("keybcs2_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_keybcs2_general_ci, /* ctype */ @@ -5197,8 +5197,8 @@ struct charset_info_st compiled_charsets[] = { { 74,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("koi8r") }, /* cset name */ - { STRING_WITH_LEN("koi8r_bin") }, /* coll name */ + { STRING_WITH_LEN("koi8r") }, /* cset name */ + { STRING_WITH_LEN("koi8r_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8r_general_ci, /* ctype */ @@ -5228,8 +5228,8 @@ struct charset_info_st compiled_charsets[] = { { 75,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("koi8u") }, /* cset name */ - { STRING_WITH_LEN("koi8u_bin") }, /* coll name */ + { STRING_WITH_LEN("koi8u") }, /* cset name */ + { STRING_WITH_LEN("koi8u_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8u_general_ci, /* ctype */ @@ -5259,8 +5259,8 @@ struct charset_info_st compiled_charsets[] = { { 77,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_bin") }, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -5290,8 +5290,8 @@ struct charset_info_st compiled_charsets[] = { { 78,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("latin5") }, /* cset name */ - { STRING_WITH_LEN("latin5_bin") }, /* coll name */ + { STRING_WITH_LEN("latin5") }, /* cset name */ + { STRING_WITH_LEN("latin5_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin5_turkish_ci, /* ctype */ @@ -5321,8 +5321,8 @@ struct charset_info_st compiled_charsets[] = { { 79,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_bin") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -5352,8 +5352,8 @@ struct charset_info_st compiled_charsets[] = { { 80,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp850") }, /* cset name */ - { STRING_WITH_LEN("cp850_bin") }, /* coll name */ + { STRING_WITH_LEN("cp850") }, /* cset name */ + { STRING_WITH_LEN("cp850_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp850_general_ci, /* ctype */ @@ -5383,8 +5383,8 @@ struct charset_info_st compiled_charsets[] = { { 81,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("cp852") }, /* cset name */ - { STRING_WITH_LEN("cp852_bin") }, /* coll name */ + { STRING_WITH_LEN("cp852") }, /* cset name */ + { STRING_WITH_LEN("cp852_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp852_general_ci, /* ctype */ @@ -5414,8 +5414,8 @@ struct charset_info_st compiled_charsets[] = { { 82,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NONASCII, - { STRING_WITH_LEN("swe7") }, /* cset name */ - { STRING_WITH_LEN("swe7_bin") }, /* coll name */ + { STRING_WITH_LEN("swe7") }, /* cset name */ + { STRING_WITH_LEN("swe7_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_swe7_swedish_ci, /* ctype */ @@ -5445,8 +5445,8 @@ struct charset_info_st compiled_charsets[] = { { 92,0,0, MY_CS_COMPILED|MY_CS_PRIMARY, - { STRING_WITH_LEN("geostd8") }, /* cset name */ - { STRING_WITH_LEN("geostd8_general_ci") }, /* coll name */ + { STRING_WITH_LEN("geostd8") }, /* cset name */ + { STRING_WITH_LEN("geostd8_general_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_geostd8_general_ci, /* ctype */ @@ -5476,8 +5476,8 @@ struct charset_info_st compiled_charsets[] = { { 93,0,0, MY_CS_COMPILED|MY_CS_BINSORT, - { STRING_WITH_LEN("geostd8") }, /* cset name */ - { STRING_WITH_LEN("geostd8_bin") }, /* coll name */ + { STRING_WITH_LEN("geostd8") }, /* cset name */ + { STRING_WITH_LEN("geostd8_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_geostd8_general_ci, /* ctype */ @@ -5507,8 +5507,8 @@ struct charset_info_st compiled_charsets[] = { { 94,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("latin1") }, /* cset name */ - { STRING_WITH_LEN("latin1_spanish_ci") }, /* coll name */ + { STRING_WITH_LEN("latin1") }, /* cset name */ + { STRING_WITH_LEN("latin1_spanish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin1_spanish_ci, /* ctype */ @@ -5538,8 +5538,8 @@ struct charset_info_st compiled_charsets[] = { { 99,0,0, MY_CS_COMPILED, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_polish_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_polish_ci") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -5569,8 +5569,8 @@ struct charset_info_st compiled_charsets[] = { { 1027,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("dec8") }, /* cset name */ - { STRING_WITH_LEN("dec8_swedish_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("dec8") }, /* cset name */ + { STRING_WITH_LEN("dec8_swedish_nopad_ci") }, /* coll name */ "", /* comment */ "[import dec8_swedish_ci]", /* tailoring */ ctype_dec8_swedish_ci, /* ctype */ @@ -5600,8 +5600,8 @@ struct charset_info_st compiled_charsets[] = { { 1028,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp850") }, /* cset name */ - { STRING_WITH_LEN("cp850_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp850") }, /* cset name */ + { STRING_WITH_LEN("cp850_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp850_general_ci]", /* tailoring */ ctype_cp850_general_ci, /* ctype */ @@ -5631,8 +5631,8 @@ struct charset_info_st compiled_charsets[] = { { 1030,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("hp8") }, /* cset name */ - { STRING_WITH_LEN("hp8_english_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("hp8") }, /* cset name */ + { STRING_WITH_LEN("hp8_english_nopad_ci") }, /* coll name */ "", /* comment */ "[import hp8_english_ci]", /* tailoring */ ctype_hp8_english_ci, /* ctype */ @@ -5662,8 +5662,8 @@ struct charset_info_st compiled_charsets[] = { { 1031,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("koi8r") }, /* cset name */ - { STRING_WITH_LEN("koi8r_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("koi8r") }, /* cset name */ + { STRING_WITH_LEN("koi8r_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import koi8r_general_ci]", /* tailoring */ ctype_koi8r_general_ci, /* ctype */ @@ -5693,8 +5693,8 @@ struct charset_info_st compiled_charsets[] = { { 1033,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import latin2_general_ci]", /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -5724,8 +5724,8 @@ struct charset_info_st compiled_charsets[] = { { 1034,0,0, MY_CS_COMPILED|MY_CS_NONASCII|MY_CS_NOPAD, - { STRING_WITH_LEN("swe7") }, /* cset name */ - { STRING_WITH_LEN("swe7_swedish_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("swe7") }, /* cset name */ + { STRING_WITH_LEN("swe7_swedish_nopad_ci") }, /* coll name */ "", /* comment */ "[import swe7_swedish_ci]", /* tailoring */ ctype_swe7_swedish_ci, /* ctype */ @@ -5755,8 +5755,8 @@ struct charset_info_st compiled_charsets[] = { { 1035,0,0, MY_CS_COMPILED|MY_CS_PUREASCII|MY_CS_NOPAD, - { STRING_WITH_LEN("ascii") }, /* cset name */ - { STRING_WITH_LEN("ascii_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("ascii") }, /* cset name */ + { STRING_WITH_LEN("ascii_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import ascii_general_ci]", /* tailoring */ ctype_ascii_general_ci, /* ctype */ @@ -5786,8 +5786,8 @@ struct charset_info_st compiled_charsets[] = { { 1040,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("hebrew") }, /* cset name */ - { STRING_WITH_LEN("hebrew_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("hebrew") }, /* cset name */ + { STRING_WITH_LEN("hebrew_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import hebrew_general_ci]", /* tailoring */ ctype_hebrew_general_ci, /* ctype */ @@ -5817,8 +5817,8 @@ struct charset_info_st compiled_charsets[] = { { 1046,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("koi8u") }, /* cset name */ - { STRING_WITH_LEN("koi8u_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("koi8u") }, /* cset name */ + { STRING_WITH_LEN("koi8u_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import koi8u_general_ci]", /* tailoring */ ctype_koi8u_general_ci, /* ctype */ @@ -5848,8 +5848,8 @@ struct charset_info_st compiled_charsets[] = { { 1049,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("greek") }, /* cset name */ - { STRING_WITH_LEN("greek_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("greek") }, /* cset name */ + { STRING_WITH_LEN("greek_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import greek_general_ci]", /* tailoring */ ctype_greek_general_ci, /* ctype */ @@ -5879,8 +5879,8 @@ struct charset_info_st compiled_charsets[] = { { 1050,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp1250_general_ci]", /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -5910,8 +5910,8 @@ struct charset_info_st compiled_charsets[] = { { 1054,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("latin5") }, /* cset name */ - { STRING_WITH_LEN("latin5_turkish_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("latin5") }, /* cset name */ + { STRING_WITH_LEN("latin5_turkish_nopad_ci") }, /* coll name */ "", /* comment */ "[import latin5_turkish_ci]", /* tailoring */ ctype_latin5_turkish_ci, /* ctype */ @@ -5941,8 +5941,8 @@ struct charset_info_st compiled_charsets[] = { { 1056,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("armscii8") }, /* cset name */ - { STRING_WITH_LEN("armscii8_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("armscii8") }, /* cset name */ + { STRING_WITH_LEN("armscii8_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import armscii8_general_ci]", /* tailoring */ ctype_armscii8_general_ci, /* ctype */ @@ -5972,8 +5972,8 @@ struct charset_info_st compiled_charsets[] = { { 1060,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp866") }, /* cset name */ - { STRING_WITH_LEN("cp866_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp866") }, /* cset name */ + { STRING_WITH_LEN("cp866_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp866_general_ci]", /* tailoring */ ctype_cp866_general_ci, /* ctype */ @@ -6003,8 +6003,8 @@ struct charset_info_st compiled_charsets[] = { { 1061,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("keybcs2") }, /* cset name */ - { STRING_WITH_LEN("keybcs2_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("keybcs2") }, /* cset name */ + { STRING_WITH_LEN("keybcs2_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import keybcs2_general_ci]", /* tailoring */ ctype_keybcs2_general_ci, /* ctype */ @@ -6034,8 +6034,8 @@ struct charset_info_st compiled_charsets[] = { { 1062,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("macce") }, /* cset name */ - { STRING_WITH_LEN("macce_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("macce") }, /* cset name */ + { STRING_WITH_LEN("macce_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import macce_general_ci]", /* tailoring */ ctype_macce_general_ci, /* ctype */ @@ -6065,8 +6065,8 @@ struct charset_info_st compiled_charsets[] = { { 1063,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("macroman") }, /* cset name */ - { STRING_WITH_LEN("macroman_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("macroman") }, /* cset name */ + { STRING_WITH_LEN("macroman_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import macroman_general_ci]", /* tailoring */ ctype_macroman_general_ci, /* ctype */ @@ -6096,8 +6096,8 @@ struct charset_info_st compiled_charsets[] = { { 1064,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp852") }, /* cset name */ - { STRING_WITH_LEN("cp852_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp852") }, /* cset name */ + { STRING_WITH_LEN("cp852_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp852_general_ci]", /* tailoring */ ctype_cp852_general_ci, /* ctype */ @@ -6127,8 +6127,8 @@ struct charset_info_st compiled_charsets[] = { { 1065,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import latin7_general_ci]", /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -6158,8 +6158,8 @@ struct charset_info_st compiled_charsets[] = { { 1067,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("macce") }, /* cset name */ - { STRING_WITH_LEN("macce_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("macce") }, /* cset name */ + { STRING_WITH_LEN("macce_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macce_general_ci, /* ctype */ @@ -6189,8 +6189,8 @@ struct charset_info_st compiled_charsets[] = { { 1074,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -6220,8 +6220,8 @@ struct charset_info_st compiled_charsets[] = { { 1075,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1251") }, /* cset name */ - { STRING_WITH_LEN("cp1251_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1251") }, /* cset name */ + { STRING_WITH_LEN("cp1251_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp1251_general_ci]", /* tailoring */ ctype_cp1251_general_ci, /* ctype */ @@ -6251,8 +6251,8 @@ struct charset_info_st compiled_charsets[] = { { 1077,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("macroman") }, /* cset name */ - { STRING_WITH_LEN("macroman_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("macroman") }, /* cset name */ + { STRING_WITH_LEN("macroman_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_macroman_general_ci, /* ctype */ @@ -6282,8 +6282,8 @@ struct charset_info_st compiled_charsets[] = { { 1081,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1256") }, /* cset name */ - { STRING_WITH_LEN("cp1256_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1256") }, /* cset name */ + { STRING_WITH_LEN("cp1256_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp1256_general_ci]", /* tailoring */ ctype_cp1256_general_ci, /* ctype */ @@ -6313,8 +6313,8 @@ struct charset_info_st compiled_charsets[] = { { 1082,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1257") }, /* cset name */ - { STRING_WITH_LEN("cp1257_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1257") }, /* cset name */ + { STRING_WITH_LEN("cp1257_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1257_general_ci, /* ctype */ @@ -6344,8 +6344,8 @@ struct charset_info_st compiled_charsets[] = { { 1083,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1257") }, /* cset name */ - { STRING_WITH_LEN("cp1257_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("cp1257") }, /* cset name */ + { STRING_WITH_LEN("cp1257_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import cp1257_general_ci]", /* tailoring */ ctype_cp1257_general_ci, /* ctype */ @@ -6375,8 +6375,8 @@ struct charset_info_st compiled_charsets[] = { { 1088,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("armscii8") }, /* cset name */ - { STRING_WITH_LEN("armscii8_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("armscii8") }, /* cset name */ + { STRING_WITH_LEN("armscii8_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_armscii8_general_ci, /* ctype */ @@ -6406,8 +6406,8 @@ struct charset_info_st compiled_charsets[] = { { 1089,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_PUREASCII|MY_CS_NOPAD, - { STRING_WITH_LEN("ascii") }, /* cset name */ - { STRING_WITH_LEN("ascii_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("ascii") }, /* cset name */ + { STRING_WITH_LEN("ascii_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_ascii_general_ci, /* ctype */ @@ -6437,8 +6437,8 @@ struct charset_info_st compiled_charsets[] = { { 1090,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1250") }, /* cset name */ - { STRING_WITH_LEN("cp1250_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1250") }, /* cset name */ + { STRING_WITH_LEN("cp1250_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1250_general_ci, /* ctype */ @@ -6468,8 +6468,8 @@ struct charset_info_st compiled_charsets[] = { { 1091,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp1256") }, /* cset name */ - { STRING_WITH_LEN("cp1256_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp1256") }, /* cset name */ + { STRING_WITH_LEN("cp1256_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp1256_general_ci, /* ctype */ @@ -6499,8 +6499,8 @@ struct charset_info_st compiled_charsets[] = { { 1092,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp866") }, /* cset name */ - { STRING_WITH_LEN("cp866_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp866") }, /* cset name */ + { STRING_WITH_LEN("cp866_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp866_general_ci, /* ctype */ @@ -6530,8 +6530,8 @@ struct charset_info_st compiled_charsets[] = { { 1093,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("dec8") }, /* cset name */ - { STRING_WITH_LEN("dec8_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("dec8") }, /* cset name */ + { STRING_WITH_LEN("dec8_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_dec8_swedish_ci, /* ctype */ @@ -6561,8 +6561,8 @@ struct charset_info_st compiled_charsets[] = { { 1094,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("greek") }, /* cset name */ - { STRING_WITH_LEN("greek_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("greek") }, /* cset name */ + { STRING_WITH_LEN("greek_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_greek_general_ci, /* ctype */ @@ -6592,8 +6592,8 @@ struct charset_info_st compiled_charsets[] = { { 1095,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("hebrew") }, /* cset name */ - { STRING_WITH_LEN("hebrew_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("hebrew") }, /* cset name */ + { STRING_WITH_LEN("hebrew_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hebrew_general_ci, /* ctype */ @@ -6623,8 +6623,8 @@ struct charset_info_st compiled_charsets[] = { { 1096,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("hp8") }, /* cset name */ - { STRING_WITH_LEN("hp8_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("hp8") }, /* cset name */ + { STRING_WITH_LEN("hp8_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_hp8_english_ci, /* ctype */ @@ -6654,8 +6654,8 @@ struct charset_info_st compiled_charsets[] = { { 1097,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("keybcs2") }, /* cset name */ - { STRING_WITH_LEN("keybcs2_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("keybcs2") }, /* cset name */ + { STRING_WITH_LEN("keybcs2_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_keybcs2_general_ci, /* ctype */ @@ -6685,8 +6685,8 @@ struct charset_info_st compiled_charsets[] = { { 1098,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("koi8r") }, /* cset name */ - { STRING_WITH_LEN("koi8r_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("koi8r") }, /* cset name */ + { STRING_WITH_LEN("koi8r_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8r_general_ci, /* ctype */ @@ -6716,8 +6716,8 @@ struct charset_info_st compiled_charsets[] = { { 1099,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("koi8u") }, /* cset name */ - { STRING_WITH_LEN("koi8u_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("koi8u") }, /* cset name */ + { STRING_WITH_LEN("koi8u_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_koi8u_general_ci, /* ctype */ @@ -6747,8 +6747,8 @@ struct charset_info_st compiled_charsets[] = { { 1101,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("latin2") }, /* cset name */ - { STRING_WITH_LEN("latin2_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("latin2") }, /* cset name */ + { STRING_WITH_LEN("latin2_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin2_general_ci, /* ctype */ @@ -6778,8 +6778,8 @@ struct charset_info_st compiled_charsets[] = { { 1102,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("latin5") }, /* cset name */ - { STRING_WITH_LEN("latin5_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("latin5") }, /* cset name */ + { STRING_WITH_LEN("latin5_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin5_turkish_ci, /* ctype */ @@ -6809,8 +6809,8 @@ struct charset_info_st compiled_charsets[] = { { 1103,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("latin7") }, /* cset name */ - { STRING_WITH_LEN("latin7_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("latin7") }, /* cset name */ + { STRING_WITH_LEN("latin7_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_latin7_general_ci, /* ctype */ @@ -6840,8 +6840,8 @@ struct charset_info_st compiled_charsets[] = { { 1104,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp850") }, /* cset name */ - { STRING_WITH_LEN("cp850_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp850") }, /* cset name */ + { STRING_WITH_LEN("cp850_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp850_general_ci, /* ctype */ @@ -6871,8 +6871,8 @@ struct charset_info_st compiled_charsets[] = { { 1105,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("cp852") }, /* cset name */ - { STRING_WITH_LEN("cp852_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("cp852") }, /* cset name */ + { STRING_WITH_LEN("cp852_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_cp852_general_ci, /* ctype */ @@ -6902,8 +6902,8 @@ struct charset_info_st compiled_charsets[] = { { 1106,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NONASCII|MY_CS_NOPAD, - { STRING_WITH_LEN("swe7") }, /* cset name */ - { STRING_WITH_LEN("swe7_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("swe7") }, /* cset name */ + { STRING_WITH_LEN("swe7_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_swe7_swedish_ci, /* ctype */ @@ -6933,8 +6933,8 @@ struct charset_info_st compiled_charsets[] = { { 1116,0,0, MY_CS_COMPILED|MY_CS_NOPAD, - { STRING_WITH_LEN("geostd8") }, /* cset name */ - { STRING_WITH_LEN("geostd8_general_nopad_ci") }, /* coll name */ + { STRING_WITH_LEN("geostd8") }, /* cset name */ + { STRING_WITH_LEN("geostd8_general_nopad_ci") }, /* coll name */ "", /* comment */ "[import geostd8_general_ci]", /* tailoring */ ctype_geostd8_general_ci, /* ctype */ @@ -6964,8 +6964,8 @@ struct charset_info_st compiled_charsets[] = { { 1117,0,0, MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_NOPAD, - { STRING_WITH_LEN("geostd8") }, /* cset name */ - { STRING_WITH_LEN("geostd8_nopad_bin") }, /* coll name */ + { STRING_WITH_LEN("geostd8") }, /* cset name */ + { STRING_WITH_LEN("geostd8_nopad_bin") }, /* coll name */ "", /* comment */ NULL, /* tailoring */ ctype_geostd8_general_ci, /* ctype */ |