summaryrefslogtreecommitdiff
path: root/strings/ctype-uca.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-08-22 02:08:59 +0300
committerSergei Golubchik <serg@mariadb.org>2021-05-19 22:54:07 +0200
commita206658b985fe5e18fb5692fdb3698dad5aca70a (patch)
treeeded15d92bd26154a7622a12f9ed6de6bd2fdf5c /strings/ctype-uca.c
parentb0910dddf53e2b41d5257bb5bda81f885044048a (diff)
downloadmariadb-git-a206658b985fe5e18fb5692fdb3698dad5aca70a.tar.gz
Change CHARSET_INFO character set and collaction names to LEX_CSTRING
This change removed 68 explict strlen() calls from the code. The following renames was done to ensure we don't use the old names when merging code from earlier releases, as using the new variables for print function could result in crashes: - charset->csname renamed to charset->cs_name - charset->name renamed to charset->coll_name Almost everything where mechanical changes except: - Changed to use the new Protocol::store(LEX_CSTRING..) when possible - Changed to use field->store(LEX_CSTRING*, CHARSET_INFO*) when possible - Changed to use String->append(LEX_CSTRING&) when possible Other things: - There where compiler issues with ensuring that all character set names points to the same string: gcc doesn't allow one to use integer constants when defining global structures (constant char * pointers works fine). To get around this, I declared defines for each character set name length.
Diffstat (limited to 'strings/ctype-uca.c')
-rw-r--r--strings/ctype-uca.c584
1 files changed, 292 insertions, 292 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 6f687c4f3fc..2bcc16bb734 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -33630,7 +33630,7 @@ init_weight_level(MY_CHARSET_LOADER *loader, MY_COLL_RULES *rules,
sizeof(uint16 *))))
return TRUE;
- /* Copy pages lengths and page pointers from the default UCA weights */
+ /* Copy pages lengths and page pointers from the default UCA weights */
memcpy(dst->lengths, src->lengths, npages);
memcpy(dst->weights, src->weights, npages * sizeof(uint16 *));
@@ -33849,7 +33849,7 @@ create_tailoring(struct charset_info_st *cs,
{
my_snprintf(loader->error, sizeof(loader->error) - 1,
"%s: no level #%d data for this Unicode version.",
- cs->name, i + 1);
+ cs->coll_name.str, i + 1);
goto ex;
}
if ((rc= init_weight_level(loader, &rules,
@@ -33894,8 +33894,8 @@ struct charset_info_st my_charset_ucs2_unicode_ci=
{
128,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_unicode_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_unicode_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -33926,8 +33926,8 @@ struct charset_info_st my_charset_ucs2_icelandic_uca_ci=
{
129,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_icelandic_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_icelandic_ci") }, /* name */
"", /* comment */
icelandic, /* tailoring */
NULL, /* ctype */
@@ -33958,8 +33958,8 @@ struct charset_info_st my_charset_ucs2_latvian_uca_ci=
{
130,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_latvian_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_latvian_ci") }, /* name */
"", /* comment */
latvian, /* tailoring */
NULL, /* ctype */
@@ -33990,8 +33990,8 @@ struct charset_info_st my_charset_ucs2_romanian_uca_ci=
{
131,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_romanian_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_romanian_ci") }, /* name */
"", /* comment */
romanian, /* tailoring */
NULL, /* ctype */
@@ -34022,8 +34022,8 @@ struct charset_info_st my_charset_ucs2_slovenian_uca_ci=
{
132,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_slovenian_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_slovenian_ci") },/* name */
"", /* comment */
slovenian, /* tailoring */
NULL, /* ctype */
@@ -34054,8 +34054,8 @@ struct charset_info_st my_charset_ucs2_polish_uca_ci=
{
133,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_polish_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_polish_ci") }, /* name */
"", /* comment */
polish, /* tailoring */
NULL, /* ctype */
@@ -34086,8 +34086,8 @@ struct charset_info_st my_charset_ucs2_estonian_uca_ci=
{
134,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_estonian_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_estonian_ci") }, /* name */
"", /* comment */
estonian, /* tailoring */
NULL, /* ctype */
@@ -34118,8 +34118,8 @@ struct charset_info_st my_charset_ucs2_spanish_uca_ci=
{
135,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_spanish_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_spanish_ci") }, /* name */
"", /* comment */
spanish, /* tailoring */
NULL, /* ctype */
@@ -34150,8 +34150,8 @@ struct charset_info_st my_charset_ucs2_swedish_uca_ci=
{
136,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_swedish_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_swedish_ci") }, /* name */
"", /* comment */
swedish, /* tailoring */
NULL, /* ctype */
@@ -34182,8 +34182,8 @@ struct charset_info_st my_charset_ucs2_turkish_uca_ci=
{
137,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_turkish_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_turkish_ci") }, /* name */
"", /* comment */
turkish, /* tailoring */
NULL, /* ctype */
@@ -34214,8 +34214,8 @@ struct charset_info_st my_charset_ucs2_czech_uca_ci=
{
138,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_czech_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_czech_ci") }, /* name */
"", /* comment */
czech, /* tailoring */
NULL, /* ctype */
@@ -34247,8 +34247,8 @@ struct charset_info_st my_charset_ucs2_danish_uca_ci=
{
139,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_danish_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_danish_ci") }, /* name */
"", /* comment */
danish, /* tailoring */
NULL, /* ctype */
@@ -34279,8 +34279,8 @@ struct charset_info_st my_charset_ucs2_lithuanian_uca_ci=
{
140,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_lithuanian_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_lithuanian_ci") },/* name */
"", /* comment */
lithuanian, /* tailoring */
NULL, /* ctype */
@@ -34311,8 +34311,8 @@ struct charset_info_st my_charset_ucs2_slovak_uca_ci=
{
141,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_slovak_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_slovak_ci") }, /* name */
"", /* comment */
slovak, /* tailoring */
NULL, /* ctype */
@@ -34343,8 +34343,8 @@ struct charset_info_st my_charset_ucs2_spanish2_uca_ci=
{
142,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_spanish2_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_spanish2_ci") }, /* name */
"", /* comment */
spanish2, /* tailoring */
NULL, /* ctype */
@@ -34376,8 +34376,8 @@ struct charset_info_st my_charset_ucs2_roman_uca_ci=
{
143,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_roman_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_roman_ci") }, /* name */
"", /* comment */
roman, /* tailoring */
NULL, /* ctype */
@@ -34409,8 +34409,8 @@ struct charset_info_st my_charset_ucs2_persian_uca_ci=
{
144,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_persian_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_persian_ci") }, /* name */
"", /* comment */
persian, /* tailoring */
NULL, /* ctype */
@@ -34442,8 +34442,8 @@ struct charset_info_st my_charset_ucs2_esperanto_uca_ci=
{
145,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_esperanto_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_esperanto_ci") },/* name */
"", /* comment */
esperanto, /* tailoring */
NULL, /* ctype */
@@ -34475,8 +34475,8 @@ struct charset_info_st my_charset_ucs2_hungarian_uca_ci=
{
146,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_hungarian_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_hungarian_ci") },/* name */
"", /* comment */
hungarian, /* tailoring */
NULL, /* ctype */
@@ -34507,8 +34507,8 @@ struct charset_info_st my_charset_ucs2_sinhala_uca_ci=
{
147,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* csname */
- "ucs2_sinhala_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_sinhala_ci") }, /* name */
"", /* comment */
sinhala, /* tailoring */
NULL, /* ctype */
@@ -34541,8 +34541,8 @@ struct charset_info_st my_charset_ucs2_german2_uca_ci=
{
148,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* csname */
- "ucs2_german2_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_german2_ci") }, /* name */
"", /* comment */
german2, /* tailoring */
NULL, /* ctype */
@@ -34573,8 +34573,8 @@ struct charset_info_st my_charset_ucs2_croatian_mysql561_uca_ci=
{
149,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_croatian_mysql561_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_croatian_mysql561_ci") },/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
NULL, /* ctype */
@@ -34606,8 +34606,8 @@ struct charset_info_st my_charset_ucs2_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UCS2,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_croatian_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_croatian_ci") }, /* name */
"", /* comment */
croatian_mariadb, /* tailoring */
NULL, /* ctype */
@@ -34639,8 +34639,8 @@ struct charset_info_st my_charset_ucs2_myanmar_uca_ci=
{
MY_PAGE2_COLLATION_ID_UCS2+1,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_myanmar_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_myanmar_ci") }, /* name */
"", /* comment */
myanmar, /* tailoring */
NULL, /* ctype */
@@ -34672,8 +34672,8 @@ struct charset_info_st my_charset_ucs2_thai_520_w2=
{
MY_PAGE2_COLLATION_ID_UCS2+2,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* flags */
- charset_name_ucs2, /* csname */
- "ucs2_thai_520_w2", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_thai_520_w2") }, /* name */
"", /* comment */
"[strength 2]", /* tailoring */
NULL, /* ctype */
@@ -34704,8 +34704,8 @@ struct charset_info_st my_charset_ucs2_unicode_520_ci=
{
150,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_unicode_520_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_unicode_520_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -34737,8 +34737,8 @@ struct charset_info_st my_charset_ucs2_vietnamese_ci=
{
151,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- charset_name_ucs2, /* csname */
- "ucs2_vietnamese_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_vietnamese_ci") },/* name */
"", /* comment */
vietnamese, /* tailoring */
NULL, /* ctype */
@@ -34770,8 +34770,8 @@ struct charset_info_st my_charset_ucs2_unicode_nopad_ci=
{
MY_NOPAD_ID(128),0,0, /* number */
MY_CS_UCS2_UCA_NOPAD_FLAGS,/* state */
- charset_name_ucs2, /* cs name */
- "ucs2_unicode_nopad_ci", /* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_unicode_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -34803,8 +34803,8 @@ struct charset_info_st my_charset_ucs2_unicode_520_nopad_ci=
{
MY_NOPAD_ID(150),0,0, /* number */
MY_CS_UCS2_UCA_NOPAD_FLAGS, /* state */
- charset_name_ucs2, /* cs name */
- "ucs2_unicode_520_nopad_ci",/* name */
+ { charset_name_ucs2, charset_name_ucs2_length }, /* cs name */
+ { STRING_WITH_LEN("ucs2_unicode_520_nopad_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -34905,8 +34905,8 @@ struct charset_info_st my_charset_utf8mb3_unicode_ci=
{
192,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_unicode_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_unicode_ci") }, /* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -34938,8 +34938,8 @@ struct charset_info_st my_charset_utf8mb3_icelandic_uca_ci=
{
193,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_icelandic_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_icelandic_ci") },/* name */
"", /* comment */
icelandic, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -34970,8 +34970,8 @@ struct charset_info_st my_charset_utf8mb3_latvian_uca_ci=
{
194,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_latvian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_latvian_ci") },/* name */
"", /* comment */
latvian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35002,8 +35002,8 @@ struct charset_info_st my_charset_utf8mb3_romanian_uca_ci=
{
195,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_romanian_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_romanian_ci") }, /* name */
"", /* comment */
romanian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35034,8 +35034,8 @@ struct charset_info_st my_charset_utf8mb3_slovenian_uca_ci=
{
196,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_slovenian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_slovenian_ci") },/* name */
"", /* comment */
slovenian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35066,8 +35066,8 @@ struct charset_info_st my_charset_utf8mb3_polish_uca_ci=
{
197,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_polish_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_polish_ci") }, /* name */
"", /* comment */
polish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35098,8 +35098,8 @@ struct charset_info_st my_charset_utf8mb3_estonian_uca_ci=
{
198,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_estonian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_estonian_ci") },/* name */
"", /* comment */
estonian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35130,8 +35130,8 @@ struct charset_info_st my_charset_utf8mb3_spanish_uca_ci=
{
199,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_spanish_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_spanish_ci") }, /* name */
"", /* comment */
spanish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35162,8 +35162,8 @@ struct charset_info_st my_charset_utf8mb3_swedish_uca_ci=
{
200,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_swedish_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_swedish_ci") }, /* name */
"", /* comment */
swedish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35194,8 +35194,8 @@ struct charset_info_st my_charset_utf8mb3_turkish_uca_ci=
{
201,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_turkish_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_turkish_ci") }, /* name */
"", /* comment */
turkish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35226,8 +35226,8 @@ struct charset_info_st my_charset_utf8mb3_czech_uca_ci=
{
202,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_czech_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_czech_ci") }, /* name */
"", /* comment */
czech, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35259,8 +35259,8 @@ struct charset_info_st my_charset_utf8mb3_danish_uca_ci=
{
203,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_danish_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_danish_ci") }, /* name */
"", /* comment */
danish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35291,8 +35291,8 @@ struct charset_info_st my_charset_utf8mb3_lithuanian_uca_ci=
{
204,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_lithuanian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_lithuanian_ci") },/* name */
"", /* comment */
lithuanian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35323,8 +35323,8 @@ struct charset_info_st my_charset_utf8mb3_slovak_uca_ci=
{
205,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_slovak_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_slovak_ci") },/* name */
"", /* comment */
slovak, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35355,8 +35355,8 @@ struct charset_info_st my_charset_utf8mb3_spanish2_uca_ci=
{
206,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_spanish2_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_spanish2_ci") },/* name */
"", /* comment */
spanish2, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35387,8 +35387,8 @@ struct charset_info_st my_charset_utf8mb3_roman_uca_ci=
{
207,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_roman_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_roman_ci") },/* name */
"", /* comment */
roman, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35419,8 +35419,8 @@ struct charset_info_st my_charset_utf8mb3_persian_uca_ci=
{
208,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_persian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_persian_ci") },/* name */
"", /* comment */
persian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35451,8 +35451,8 @@ struct charset_info_st my_charset_utf8mb3_esperanto_uca_ci=
{
209,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_esperanto_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_esperanto_ci") },/* name */
"", /* comment */
esperanto, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35483,8 +35483,8 @@ struct charset_info_st my_charset_utf8mb3_hungarian_uca_ci=
{
210,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_hungarian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_hungarian_ci") },/* name */
"", /* comment */
hungarian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35515,8 +35515,8 @@ struct charset_info_st my_charset_utf8mb3_sinhala_uca_ci=
{
211,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_sinhala_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_sinhala_ci") }, /* name */
"", /* comment */
sinhala, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35548,8 +35548,8 @@ struct charset_info_st my_charset_utf8mb3_german2_uca_ci=
{
212,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_german2_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_german2_ci") },/* name */
"", /* comment */
german2, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35580,8 +35580,8 @@ struct charset_info_st my_charset_utf8mb3_croatian_mysql561_uca_ci=
{
213,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_croatian_mysql561_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_croatian_mysql561_ci") },/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35613,8 +35613,8 @@ struct charset_info_st my_charset_utf8mb3_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_croatian_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_croatian_ci") }, /* name */
"", /* comment */
croatian_mariadb, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35646,8 +35646,8 @@ struct charset_info_st my_charset_utf8mb3_myanmar_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8+1,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_myanmar_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_myanmar_ci") },/* name */
"", /* comment */
myanmar, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35679,8 +35679,8 @@ struct charset_info_st my_charset_utf8mb3_unicode_520_ci=
{
214,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* csname */
- MY_UTF8MB3 "_unicode_520_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_unicode_520_ci") }, /* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35711,8 +35711,8 @@ struct charset_info_st my_charset_utf8mb3_thai_520_w2=
{
MY_PAGE2_COLLATION_ID_UTF8+2,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* csname */
- MY_UTF8MB3 "_thai_520_w2",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_thai_520_w2") },/* name */
"", /* comment */
"[strength 2]", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35743,8 +35743,8 @@ struct charset_info_st my_charset_utf8mb3_vietnamese_ci=
{
215,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_vietnamese_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_vietnamese_ci") },/* name */
"", /* comment */
vietnamese, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35776,8 +35776,8 @@ struct charset_info_st my_charset_utf8mb3_unicode_nopad_ci=
{
MY_NOPAD_ID(192),0,0, /* number */
MY_CS_UTF8MB3_UCA_NOPAD_FLAGS, /* flags */
- charset_name_utf8mb3, /* cs name */
- MY_UTF8MB3 "_unicode_nopad_ci",/* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_unicode_nopad_ci") },/* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35809,8 +35809,8 @@ struct charset_info_st my_charset_utf8mb3_unicode_520_nopad_ci=
{
MY_NOPAD_ID(214),0,0, /* number */
MY_CS_UTF8MB3_UCA_NOPAD_FLAGS, /* flags */
- charset_name_utf8mb3, /* csname */
- MY_UTF8MB3 "_unicode_520_nopad_ci", /* name */
+ { charset_name_utf8mb3, charset_name_utf8mb3_length }, /* cs name */
+ { STRING_WITH_LEN(MY_UTF8MB3 "_unicode_520_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35884,8 +35884,8 @@ struct charset_info_st my_charset_utf8mb4_unicode_ci=
{
224,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_unicode_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_unicode_ci") },/* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35917,8 +35917,8 @@ struct charset_info_st my_charset_utf8mb4_icelandic_uca_ci=
{
225,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_icelandic_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_icelandic_ci") },/* name */
"", /* comment */
icelandic, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35949,8 +35949,8 @@ struct charset_info_st my_charset_utf8mb4_latvian_uca_ci=
{
226,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_latvian_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_latvian_ci") }, /* name */
"", /* comment */
latvian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -35981,8 +35981,8 @@ struct charset_info_st my_charset_utf8mb4_romanian_uca_ci=
{
227,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_romanian_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_romanian_ci") }, /* name */
"", /* comment */
romanian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36013,8 +36013,8 @@ struct charset_info_st my_charset_utf8mb4_slovenian_uca_ci=
{
228,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_slovenian_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_slovenian_ci") },/* name */
"", /* comment */
slovenian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36045,8 +36045,8 @@ struct charset_info_st my_charset_utf8mb4_polish_uca_ci=
{
229,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_polish_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_polish_ci") }, /* name */
"", /* comment */
polish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36077,8 +36077,8 @@ struct charset_info_st my_charset_utf8mb4_estonian_uca_ci=
{
230,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_estonian_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_estonian_ci") }, /* name */
"", /* comment */
estonian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36109,8 +36109,8 @@ struct charset_info_st my_charset_utf8mb4_spanish_uca_ci=
{
231,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_spanish_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_spanish_ci") }, /* name */
"", /* comment */
spanish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36141,8 +36141,8 @@ struct charset_info_st my_charset_utf8mb4_swedish_uca_ci=
{
232,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_swedish_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_swedish_ci") }, /* name */
"", /* comment */
swedish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36173,8 +36173,8 @@ struct charset_info_st my_charset_utf8mb4_turkish_uca_ci=
{
233,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_turkish_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_turkish_ci") }, /* name */
"", /* comment */
turkish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36205,8 +36205,8 @@ struct charset_info_st my_charset_utf8mb4_czech_uca_ci=
{
234,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_czech_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_czech_ci") }, /* name */
"", /* comment */
czech, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36238,8 +36238,8 @@ struct charset_info_st my_charset_utf8mb4_danish_uca_ci=
{
235,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_danish_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_danish_ci") }, /* name */
"", /* comment */
danish, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36270,8 +36270,8 @@ struct charset_info_st my_charset_utf8mb4_lithuanian_uca_ci=
{
236,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_lithuanian_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_lithuanian_ci") },/* name */
"", /* comment */
lithuanian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36302,8 +36302,8 @@ struct charset_info_st my_charset_utf8mb4_slovak_uca_ci=
{
237,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_slovak_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_slovak_ci") }, /* name */
"", /* comment */
slovak, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36334,8 +36334,8 @@ struct charset_info_st my_charset_utf8mb4_spanish2_uca_ci=
{
238,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_spanish2_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_spanish2_ci") }, /* name */
"", /* comment */
spanish2, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36366,8 +36366,8 @@ struct charset_info_st my_charset_utf8mb4_roman_uca_ci=
{
239,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_roman_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_roman_ci") }, /* name */
"", /* comment */
roman, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36398,8 +36398,8 @@ struct charset_info_st my_charset_utf8mb4_persian_uca_ci=
{
240,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_persian_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_persian_ci") }, /* name */
"", /* comment */
persian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36430,8 +36430,8 @@ struct charset_info_st my_charset_utf8mb4_esperanto_uca_ci=
{
241,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_esperanto_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_esperanto_ci") },/* name */
"", /* comment */
esperanto, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36462,8 +36462,8 @@ struct charset_info_st my_charset_utf8mb4_hungarian_uca_ci=
{
242,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_hungarian_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_hungarian_ci") },/* name */
"", /* comment */
hungarian, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36494,8 +36494,8 @@ struct charset_info_st my_charset_utf8mb4_sinhala_uca_ci=
{
243,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_sinhala_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_sinhala_ci") },/* name */
"", /* comment */
sinhala, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36526,8 +36526,8 @@ struct charset_info_st my_charset_utf8mb4_german2_uca_ci=
{
244,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_german2_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_german2_ci") },/* name */
"", /* comment */
german2, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36558,8 +36558,8 @@ struct charset_info_st my_charset_utf8mb4_croatian_mysql561_uca_ci=
{
245,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_croatian_mysql561_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_croatian_mysql561_ci") },/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36591,8 +36591,8 @@ struct charset_info_st my_charset_utf8mb4_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8MB4,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_croatian_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_croatian_ci") },/* name */
"", /* comment */
croatian_mariadb, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36624,8 +36624,8 @@ struct charset_info_st my_charset_utf8mb4_myanmar_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8MB4+1,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_myanmar_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_myanmar_ci") },/* name */
"", /* comment */
myanmar, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36656,8 +36656,8 @@ struct charset_info_st my_charset_utf8mb4_thai_520_w2=
{
MY_PAGE2_COLLATION_ID_UTF8MB4+2,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* flags */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_thai_520_w2", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_thai_520_w2") }, /* name */
"", /* comment */
"[strength 2]", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36688,8 +36688,8 @@ struct charset_info_st my_charset_utf8mb4_unicode_520_ci=
{
246,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* flags */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_unicode_520_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_unicode_520_ci") },/* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36721,8 +36721,8 @@ struct charset_info_st my_charset_utf8mb4_vietnamese_ci=
{
247,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_vietnamese_ci",/* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_vietnamese_ci") },/* name */
"", /* comment */
vietnamese, /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36754,8 +36754,8 @@ struct charset_info_st my_charset_utf8mb4_unicode_nopad_ci=
{
MY_NOPAD_ID(224),0,0, /* number */
MY_CS_UTF8MB4_UCA_NOPAD_FLAGS, /* state */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_unicode_nopad_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_unicode_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36787,8 +36787,8 @@ struct charset_info_st my_charset_utf8mb4_unicode_520_nopad_ci=
{
MY_NOPAD_ID(246),0,0, /* number */
MY_CS_UTF8MB4_UCA_NOPAD_FLAGS, /* flags */
- charset_name_utf8mb4, /* csname */
- MY_UTF8MB4 "_unicode_520_nopad_ci", /* name */
+ { charset_name_utf8mb4, charset_name_utf8mb4_length }, /* csname */
+ { STRING_WITH_LEN(MY_UTF8MB4 "_unicode_520_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
ctype_utf8mb3, /* ctype */
@@ -36839,8 +36839,8 @@ struct charset_info_st my_charset_utf32_unicode_ci=
{
160,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_unicode_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_unicode_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -36872,8 +36872,8 @@ struct charset_info_st my_charset_utf32_icelandic_uca_ci=
{
161,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_icelandic_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_icelandic_ci") },/* name */
"", /* comment */
icelandic, /* tailoring */
NULL, /* ctype */
@@ -36904,8 +36904,8 @@ struct charset_info_st my_charset_utf32_latvian_uca_ci=
{
162,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_latvian_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_latvian_ci") }, /* name */
"", /* comment */
latvian, /* tailoring */
NULL, /* ctype */
@@ -36936,8 +36936,8 @@ struct charset_info_st my_charset_utf32_romanian_uca_ci=
{
163,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_romanian_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_romanian_ci") }, /* name */
"", /* comment */
romanian, /* tailoring */
NULL, /* ctype */
@@ -36968,8 +36968,8 @@ struct charset_info_st my_charset_utf32_slovenian_uca_ci=
{
164,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_slovenian_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_slovenian_ci") },/* name */
"", /* comment */
slovenian, /* tailoring */
NULL, /* ctype */
@@ -37000,8 +37000,8 @@ struct charset_info_st my_charset_utf32_polish_uca_ci=
{
165,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_polish_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_polish_ci") }, /* name */
"", /* comment */
polish, /* tailoring */
NULL, /* ctype */
@@ -37032,8 +37032,8 @@ struct charset_info_st my_charset_utf32_estonian_uca_ci=
{
166,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_estonian_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_estonian_ci") }, /* name */
"", /* comment */
estonian, /* tailoring */
NULL, /* ctype */
@@ -37064,8 +37064,8 @@ struct charset_info_st my_charset_utf32_spanish_uca_ci=
{
167,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_spanish_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_spanish_ci") }, /* name */
"", /* comment */
spanish, /* tailoring */
NULL, /* ctype */
@@ -37096,8 +37096,8 @@ struct charset_info_st my_charset_utf32_swedish_uca_ci=
{
168,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_swedish_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_swedish_ci") }, /* name */
"", /* comment */
swedish, /* tailoring */
NULL, /* ctype */
@@ -37128,8 +37128,8 @@ struct charset_info_st my_charset_utf32_turkish_uca_ci=
{
169,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_turkish_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_turkish_ci") }, /* name */
"", /* comment */
turkish, /* tailoring */
NULL, /* ctype */
@@ -37160,8 +37160,8 @@ struct charset_info_st my_charset_utf32_czech_uca_ci=
{
170,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_czech_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_czech_ci") }, /* name */
"", /* comment */
czech, /* tailoring */
NULL, /* ctype */
@@ -37193,8 +37193,8 @@ struct charset_info_st my_charset_utf32_danish_uca_ci=
{
171,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_danish_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_danish_ci") }, /* name */
"", /* comment */
danish, /* tailoring */
NULL, /* ctype */
@@ -37225,8 +37225,8 @@ struct charset_info_st my_charset_utf32_lithuanian_uca_ci=
{
172,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_lithuanian_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_lithuanian_ci") },/* name */
"", /* comment */
lithuanian, /* tailoring */
NULL, /* ctype */
@@ -37257,8 +37257,8 @@ struct charset_info_st my_charset_utf32_slovak_uca_ci=
{
173,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_slovak_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_slovak_ci") }, /* name */
"", /* comment */
slovak, /* tailoring */
NULL, /* ctype */
@@ -37289,8 +37289,8 @@ struct charset_info_st my_charset_utf32_spanish2_uca_ci=
{
174,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_spanish2_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_spanish2_ci") }, /* name */
"", /* comment */
spanish2, /* tailoring */
NULL, /* ctype */
@@ -37321,8 +37321,8 @@ struct charset_info_st my_charset_utf32_roman_uca_ci=
{
175,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_roman_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_roman_ci") }, /* name */
"", /* comment */
roman, /* tailoring */
NULL, /* ctype */
@@ -37353,8 +37353,8 @@ struct charset_info_st my_charset_utf32_persian_uca_ci=
{
176,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_persian_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_persian_ci") }, /* name */
"", /* comment */
persian, /* tailoring */
NULL, /* ctype */
@@ -37385,8 +37385,8 @@ struct charset_info_st my_charset_utf32_esperanto_uca_ci=
{
177,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_esperanto_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_esperanto_ci") },/* name */
"", /* comment */
esperanto, /* tailoring */
NULL, /* ctype */
@@ -37417,8 +37417,8 @@ struct charset_info_st my_charset_utf32_hungarian_uca_ci=
{
178,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_hungarian_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_hungarian_ci") },/* name */
"", /* comment */
hungarian, /* tailoring */
NULL, /* ctype */
@@ -37449,8 +37449,8 @@ struct charset_info_st my_charset_utf32_sinhala_uca_ci=
{
179,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_sinhala_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_sinhala_ci") }, /* name */
"", /* comment */
sinhala, /* tailoring */
NULL, /* ctype */
@@ -37481,8 +37481,8 @@ struct charset_info_st my_charset_utf32_german2_uca_ci=
{
180,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_german2_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_german2_ci") }, /* name */
"", /* comment */
german2, /* tailoring */
NULL, /* ctype */
@@ -37513,8 +37513,8 @@ struct charset_info_st my_charset_utf32_croatian_mysql561_uca_ci=
{
181,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_croatian_mysql561_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_croatian_mysql561_ci") }, /* name */
"", /* comment */
croatian_mysql561, /* tailoring */
NULL, /* ctype */
@@ -37545,8 +37545,8 @@ struct charset_info_st my_charset_utf32_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF32,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_croatian_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_croatian_ci") }, /* name */
"", /* comment */
croatian_mariadb, /* tailoring */
NULL, /* ctype */
@@ -37578,8 +37578,8 @@ struct charset_info_st my_charset_utf32_myanmar_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF32+1,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_myanmar_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_myanmar_ci") }, /* name */
"", /* comment */
myanmar, /* tailoring */
NULL, /* ctype */
@@ -37611,8 +37611,8 @@ struct charset_info_st my_charset_utf32_thai_520_w2=
{
MY_PAGE2_COLLATION_ID_UTF32+2,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_thai_520_w2",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_thai_520_w2") },/* name */
"", /* comment */
"[strength 2]", /* tailoring */
NULL, /* ctype */
@@ -37644,8 +37644,8 @@ struct charset_info_st my_charset_utf32_unicode_520_ci=
{
182,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* stat e */
- charset_name_utf32, /* csname */
- "utf32_unicode_520_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_unicode_520_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -37677,8 +37677,8 @@ struct charset_info_st my_charset_utf32_vietnamese_ci=
{
183,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- charset_name_utf32, /* csname */
- "utf32_vietnamese_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_vietnamese_ci") },/* name */
"", /* comment */
vietnamese, /* tailoring */
NULL, /* ctype */
@@ -37710,8 +37710,8 @@ struct charset_info_st my_charset_utf32_unicode_nopad_ci=
{
MY_NOPAD_ID(160),0,0, /* number */
MY_CS_UTF32_UCA_NOPAD_FLAGS, /* state */
- charset_name_utf32, /* csname */
- "utf32_unicode_nopad_ci", /* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_unicode_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -37743,8 +37743,8 @@ struct charset_info_st my_charset_utf32_unicode_520_nopad_ci=
{
MY_NOPAD_ID(182),0,0, /* number */
MY_CS_UTF32_UCA_NOPAD_FLAGS, /* state */
- charset_name_utf32, /* csname */
- "utf32_unicode_520_nopad_ci",/* name */
+ { charset_name_utf32, charset_name_utf32_length }, /* csname */
+ { STRING_WITH_LEN("utf32_unicode_520_nopad_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -37796,8 +37796,8 @@ struct charset_info_st my_charset_utf16_unicode_ci=
{
101,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* csname */
- "utf16_unicode_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_unicode_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -37829,8 +37829,8 @@ struct charset_info_st my_charset_utf16_icelandic_uca_ci=
{
102,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* csname */
- "utf16_icelandic_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_icelandic_ci") },/* name */
"", /* comment */
icelandic, /* tailoring */
NULL, /* ctype */
@@ -37861,8 +37861,8 @@ struct charset_info_st my_charset_utf16_latvian_uca_ci=
{
103,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_latvian_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_latvian_ci") }, /* name */
"", /* comment */
latvian, /* tailoring */
NULL, /* ctype */
@@ -37893,8 +37893,8 @@ struct charset_info_st my_charset_utf16_romanian_uca_ci=
{
104,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_romanian_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_romanian_ci") }, /* name */
"", /* comment */
romanian, /* tailoring */
NULL, /* ctype */
@@ -37925,8 +37925,8 @@ struct charset_info_st my_charset_utf16_slovenian_uca_ci=
{
105,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_slovenian_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_slovenian_ci") },/* name */
"", /* comment */
slovenian, /* tailoring */
NULL, /* ctype */
@@ -37957,8 +37957,8 @@ struct charset_info_st my_charset_utf16_polish_uca_ci=
{
106,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_polish_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_polish_ci") }, /* name */
"", /* comment */
polish, /* tailoring */
NULL, /* ctype */
@@ -37989,8 +37989,8 @@ struct charset_info_st my_charset_utf16_estonian_uca_ci=
{
107,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_estonian_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_estonian_ci") }, /* name */
"", /* comment */
estonian, /* tailoring */
NULL, /* ctype */
@@ -38021,8 +38021,8 @@ struct charset_info_st my_charset_utf16_spanish_uca_ci=
{
108,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_spanish_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_spanish_ci") }, /* name */
"", /* comment */
spanish, /* tailoring */
NULL, /* ctype */
@@ -38053,8 +38053,8 @@ struct charset_info_st my_charset_utf16_swedish_uca_ci=
{
109,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_swedish_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_swedish_ci") }, /* name */
"", /* comment */
swedish, /* tailoring */
NULL, /* ctype */
@@ -38085,8 +38085,8 @@ struct charset_info_st my_charset_utf16_turkish_uca_ci=
{
110,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_turkish_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_turkish_ci") }, /* name */
"", /* comment */
turkish, /* tailoring */
NULL, /* ctype */
@@ -38117,8 +38117,8 @@ struct charset_info_st my_charset_utf16_czech_uca_ci=
{
111,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_czech_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_czech_ci") }, /* name */
"", /* comment */
czech, /* tailoring */
NULL, /* ctype */
@@ -38150,8 +38150,8 @@ struct charset_info_st my_charset_utf16_danish_uca_ci=
{
112,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_danish_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_danish_ci") }, /* name */
"", /* comment */
danish, /* tailoring */
NULL, /* ctype */
@@ -38182,8 +38182,8 @@ struct charset_info_st my_charset_utf16_lithuanian_uca_ci=
{
113,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_lithuanian_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_lithuanian_ci") },/* name */
"", /* comment */
lithuanian, /* tailoring */
NULL, /* ctype */
@@ -38214,8 +38214,8 @@ struct charset_info_st my_charset_utf16_slovak_uca_ci=
{
114,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_slovak_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_slovak_ci") }, /* name */
"", /* comment */
slovak, /* tailoring */
NULL, /* ctype */
@@ -38246,8 +38246,8 @@ struct charset_info_st my_charset_utf16_spanish2_uca_ci=
{
115,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_spanish2_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_spanish2_ci") },/* name */
"", /* comment */
spanish2, /* tailoring */
NULL, /* ctype */
@@ -38278,8 +38278,8 @@ struct charset_info_st my_charset_utf16_roman_uca_ci=
{
116,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_roman_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_roman_ci") }, /* name */
"", /* comment */
roman, /* tailoring */
NULL, /* ctype */
@@ -38310,8 +38310,8 @@ struct charset_info_st my_charset_utf16_persian_uca_ci=
{
117,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_persian_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_persian_ci") }, /* name */
"", /* comment */
persian, /* tailoring */
NULL, /* ctype */
@@ -38342,8 +38342,8 @@ struct charset_info_st my_charset_utf16_esperanto_uca_ci=
{
118,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_esperanto_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_esperanto_ci") },/* name */
"", /* comment */
esperanto, /* tailoring */
NULL, /* ctype */
@@ -38374,8 +38374,8 @@ struct charset_info_st my_charset_utf16_hungarian_uca_ci=
{
119,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_hungarian_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_hungarian_ci") },/* name */
"", /* comment */
hungarian, /* tailoring */
NULL, /* ctype */
@@ -38406,8 +38406,8 @@ struct charset_info_st my_charset_utf16_sinhala_uca_ci=
{
120,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_sinhala_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_sinhala_ci") },/* name */
"", /* comment */
sinhala, /* tailoring */
NULL, /* ctype */
@@ -38438,8 +38438,8 @@ struct charset_info_st my_charset_utf16_german2_uca_ci=
{
121,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_german2_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_german2_ci") },/* name */
"", /* comment */
german2, /* tailoring */
NULL, /* ctype */
@@ -38471,8 +38471,8 @@ struct charset_info_st my_charset_utf16_croatian_mysql561_uca_ci=
{
122,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_croatian_mysql561_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_croatian_mysql561_ci") },/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
NULL, /* ctype */
@@ -38504,8 +38504,8 @@ struct charset_info_st my_charset_utf16_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF16,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_croatian_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_croatian_ci") },/* name */
"", /* comment */
croatian_mariadb, /* tailoring */
NULL, /* ctype */
@@ -38537,8 +38537,8 @@ struct charset_info_st my_charset_utf16_myanmar_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF16+1,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_myanmar_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_myanmar_ci") },/* name */
"", /* comment */
myanmar, /* tailoring */
NULL, /* ctype */
@@ -38570,8 +38570,8 @@ struct charset_info_st my_charset_utf16_thai_520_w2=
{
MY_PAGE2_COLLATION_ID_UTF16+2,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_thai_520_w2",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_thai_520_w2") },/* name */
"", /* comment */
"[strength 2]", /* tailoring */
NULL, /* ctype */
@@ -38603,8 +38603,8 @@ struct charset_info_st my_charset_utf16_unicode_520_ci=
{
123,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* csname */
- "utf16_unicode_520_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_unicode_520_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -38636,8 +38636,8 @@ struct charset_info_st my_charset_utf16_vietnamese_ci=
{
124,0,0, /* number */
MY_CS_UTF16_UCA_FLAGS,/* state */
- charset_name_utf16, /* cs name */
- "utf16_vietnamese_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_vietnamese_ci") },/* name */
"", /* comment */
vietnamese, /* tailoring */
NULL, /* ctype */
@@ -38669,8 +38669,8 @@ struct charset_info_st my_charset_utf16_unicode_nopad_ci=
{
MY_NOPAD_ID(101),0,0, /* number */
MY_CS_UTF16_UCA_NOPAD_FLAGS, /* state */
- charset_name_utf16, /* csname */
- "utf16_unicode_nopad_ci", /* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_unicode_nopad_ci") }, /* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
@@ -38702,8 +38702,8 @@ struct charset_info_st my_charset_utf16_unicode_520_nopad_ci=
{
MY_NOPAD_ID(123),0,0, /* number */
MY_CS_UTF16_UCA_NOPAD_FLAGS, /* state */
- charset_name_utf16, /* csname */
- "utf16_unicode_520_nopad_ci",/* name */
+ { charset_name_utf16, charset_name_utf16_length }, /* csname */
+ { STRING_WITH_LEN("utf16_unicode_520_nopad_ci") },/* name */
"", /* comment */
"", /* tailoring */
NULL, /* ctype */
View Lorry Controller Status