summaryrefslogtreecommitdiff
path: root/strings/ctype-uca.c
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-06-28 09:05:12 +0400
committerAlexander Barkov <bar@mariadb.com>2019-06-28 12:37:04 +0400
commit3e7e87ddccf71ba5328c257b7d642d6803fbca3a (patch)
tree0ea22d4c533b84b2675c3d7c7555f5ad367222ac /strings/ctype-uca.c
parent323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff)
downloadmariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'strings/ctype-uca.c')
-rw-r--r--strings/ctype-uca.c526
1 files changed, 263 insertions, 263 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 312b903ea64..99a0d0f46ae 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -32312,7 +32312,7 @@ static my_coll_lexem_num my_coll_lexem_next(MY_COLL_LEXEM *lexem)
/* Escaped character, e.g. \u1234 */
if ((*beg == '\\') && (beg + 2 < lexem->end) &&
- (beg[1] == 'u') && my_isxdigit(&my_charset_utf8_general_ci, beg[2]))
+ (beg[1] == 'u') && my_isxdigit(&my_charset_utf8mb3_general_ci, beg[2]))
{
int ch;
@@ -32341,7 +32341,7 @@ static my_coll_lexem_num my_coll_lexem_next(MY_COLL_LEXEM *lexem)
if (((uchar) *beg) > 0x7F) /* Unescaped multibyte character */
{
- CHARSET_INFO *cs= &my_charset_utf8_general_ci;
+ CHARSET_INFO *cs= &my_charset_utf8mb3_general_ci;
my_wc_t wc;
int nbytes= cs->cset->mb_wc(cs, &wc,
(uchar *) beg, (uchar *) lexem->end);
@@ -33720,7 +33720,7 @@ static my_bool
my_coll_init_uca(struct charset_info_st *cs, MY_CHARSET_LOADER *loader)
{
cs->pad_char= ' ';
- cs->ctype= my_charset_utf8_unicode_ci.ctype;
+ cs->ctype= my_charset_utf8mb3_unicode_ci.ctype;
if (!cs->caseinfo)
cs->caseinfo= &my_unicase_default;
return create_tailoring(cs, loader);
@@ -33894,7 +33894,7 @@ struct charset_info_st my_charset_ucs2_unicode_ci=
{
128,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_unicode_ci", /* name */
"", /* comment */
"", /* tailoring */
@@ -33926,7 +33926,7 @@ struct charset_info_st my_charset_ucs2_icelandic_uca_ci=
{
129,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_icelandic_ci",/* name */
"", /* comment */
icelandic, /* tailoring */
@@ -33958,7 +33958,7 @@ struct charset_info_st my_charset_ucs2_latvian_uca_ci=
{
130,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_latvian_ci", /* name */
"", /* comment */
latvian, /* tailoring */
@@ -33990,7 +33990,7 @@ struct charset_info_st my_charset_ucs2_romanian_uca_ci=
{
131,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_romanian_ci", /* name */
"", /* comment */
romanian, /* tailoring */
@@ -34022,7 +34022,7 @@ struct charset_info_st my_charset_ucs2_slovenian_uca_ci=
{
132,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_slovenian_ci",/* name */
"", /* comment */
slovenian, /* tailoring */
@@ -34054,7 +34054,7 @@ struct charset_info_st my_charset_ucs2_polish_uca_ci=
{
133,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_polish_ci", /* name */
"", /* comment */
polish, /* tailoring */
@@ -34086,7 +34086,7 @@ struct charset_info_st my_charset_ucs2_estonian_uca_ci=
{
134,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_estonian_ci", /* name */
"", /* comment */
estonian, /* tailoring */
@@ -34118,7 +34118,7 @@ struct charset_info_st my_charset_ucs2_spanish_uca_ci=
{
135,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_spanish_ci", /* name */
"", /* comment */
spanish, /* tailoring */
@@ -34150,7 +34150,7 @@ struct charset_info_st my_charset_ucs2_swedish_uca_ci=
{
136,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_swedish_ci", /* name */
"", /* comment */
swedish, /* tailoring */
@@ -34182,7 +34182,7 @@ struct charset_info_st my_charset_ucs2_turkish_uca_ci=
{
137,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_turkish_ci", /* name */
"", /* comment */
turkish, /* tailoring */
@@ -34214,7 +34214,7 @@ struct charset_info_st my_charset_ucs2_czech_uca_ci=
{
138,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_czech_ci", /* name */
"", /* comment */
czech, /* tailoring */
@@ -34247,7 +34247,7 @@ struct charset_info_st my_charset_ucs2_danish_uca_ci=
{
139,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_danish_ci", /* name */
"", /* comment */
danish, /* tailoring */
@@ -34279,8 +34279,8 @@ struct charset_info_st my_charset_ucs2_lithuanian_uca_ci=
{
140,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
- "ucs2_lithuanian_ci",/* name */
+ "ucs2", /* cs name */
+ "ucs2_lithuanian_ci",/* name */
"", /* comment */
lithuanian, /* tailoring */
NULL, /* ctype */
@@ -34311,7 +34311,7 @@ struct charset_info_st my_charset_ucs2_slovak_uca_ci=
{
141,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_slovak_ci", /* name */
"", /* comment */
slovak, /* tailoring */
@@ -34343,7 +34343,7 @@ struct charset_info_st my_charset_ucs2_spanish2_uca_ci=
{
142,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_spanish2_ci", /* name */
"", /* comment */
spanish2, /* tailoring */
@@ -34376,7 +34376,7 @@ struct charset_info_st my_charset_ucs2_roman_uca_ci=
{
143,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_roman_ci", /* name */
"", /* comment */
roman, /* tailoring */
@@ -34409,7 +34409,7 @@ struct charset_info_st my_charset_ucs2_persian_uca_ci=
{
144,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_persian_ci", /* name */
"", /* comment */
persian, /* tailoring */
@@ -34442,7 +34442,7 @@ struct charset_info_st my_charset_ucs2_esperanto_uca_ci=
{
145,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_esperanto_ci",/* name */
"", /* comment */
esperanto, /* tailoring */
@@ -34475,7 +34475,7 @@ struct charset_info_st my_charset_ucs2_hungarian_uca_ci=
{
146,0,0, /* number */
MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
+ "ucs2", /* cs name */
"ucs2_hungarian_ci",/* name */
"", /* comment */
hungarian, /* tailoring */
@@ -34506,8 +34506,8 @@ struct charset_info_st my_charset_ucs2_hungarian_uca_ci=
struct charset_info_st my_charset_ucs2_sinhala_uca_ci=
{
147,0,0, /* number */
- MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* csname */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
+ "ucs2", /* csname */
"ucs2_sinhala_ci", /* name */
"", /* comment */
sinhala, /* tailoring */
@@ -34540,8 +34540,8 @@ struct charset_info_st my_charset_ucs2_sinhala_uca_ci=
struct charset_info_st my_charset_ucs2_german2_uca_ci=
{
148,0,0, /* number */
- MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* csname */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
+ "ucs2", /* csname */
"ucs2_german2_ci", /* name */
"", /* comment */
german2, /* tailoring */
@@ -34572,9 +34572,9 @@ struct charset_info_st my_charset_ucs2_german2_uca_ci=
struct charset_info_st my_charset_ucs2_croatian_mysql561_uca_ci=
{
149,0,0, /* number */
- MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
- "ucs2_croatian_mysql561_ci", /* name */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
+ "ucs2", /* cs name */
+ "ucs2_croatian_mysql561_ci",/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
NULL, /* ctype */
@@ -34605,9 +34605,9 @@ struct charset_info_st my_charset_ucs2_croatian_mysql561_uca_ci=
struct charset_info_st my_charset_ucs2_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UCS2,0,0, /* number */
- MY_CS_UCS2_UCA_FLAGS,/* state */
- "ucs2", /* cs name */
- "ucs2_croatian_ci", /* name */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
+ "ucs2", /* cs name */
+ "ucs2_croatian_ci", /* name */
"", /* comment */
croatian_mariadb, /* tailoring */
NULL, /* ctype */
@@ -34638,9 +34638,9 @@ struct charset_info_st my_charset_ucs2_croatian_uca_ci=
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 */
- "ucs2", /* cs name */
- "ucs2_myanmar_ci", /* name */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
+ "ucs2", /* cs name */
+ "ucs2_myanmar_ci", /* name */
"", /* comment */
myanmar, /* tailoring */
NULL, /* ctype */
@@ -34736,7 +34736,7 @@ struct charset_info_st my_charset_ucs2_unicode_520_ci=
struct charset_info_st my_charset_ucs2_vietnamese_ci=
{
151,0,0, /* number */
- MY_CS_UCS2_UCA_FLAGS,/* state */
+ MY_CS_UCS2_UCA_FLAGS,/* state */
"ucs2", /* csname */
"ucs2_vietnamese_ci",/* name */
"", /* comment */
@@ -34835,7 +34835,7 @@ struct charset_info_st my_charset_ucs2_unicode_520_nopad_ci=
#endif
-#ifdef HAVE_CHARSET_utf8
+#ifdef HAVE_CHARSET_utf8mb3
static my_bool
my_uca_coll_init_utf8mb3(struct charset_info_st *cs, MY_CHARSET_LOADER *loader);
@@ -34876,7 +34876,7 @@ my_uca_coll_init_utf8mb3(struct charset_info_st *cs, MY_CHARSET_LOADER *loader)
expressions. Note, there is no need to mark byte 255 as a
letter, it is illegal byte in UTF8.
*/
-static uchar ctype_utf8[] = {
+static uchar ctype_utf8mb3[] = {
0,
32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
@@ -34896,20 +34896,20 @@ static uchar ctype_utf8[] = {
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0
};
-extern MY_CHARSET_HANDLER my_charset_utf8_handler;
+extern MY_CHARSET_HANDLER my_charset_utf8mb3_handler;
#define MY_CS_UTF8MB3_UCA_FLAGS MY_CS_COMMON_UCA_FLAGS
#define MY_CS_UTF8MB3_UCA_NOPAD_FLAGS (MY_CS_UTF8MB3_UCA_FLAGS|MY_CS_NOPAD)
-struct charset_info_st my_charset_utf8_unicode_ci=
+struct charset_info_st my_charset_utf8mb3_unicode_ci=
{
192,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_unicode_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_unicode_ci", /* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -34929,20 +34929,20 @@ struct charset_info_st my_charset_utf8_unicode_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_icelandic_uca_ci=
+struct charset_info_st my_charset_utf8mb3_icelandic_uca_ci=
{
193,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_icelandic_ci",/* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_icelandic_ci",/* name */
"", /* comment */
icelandic, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -34962,19 +34962,19 @@ struct charset_info_st my_charset_utf8_icelandic_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_latvian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_latvian_uca_ci=
{
194,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_latvian_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_latvian_ci",/* name */
"", /* comment */
latvian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -34994,19 +34994,19 @@ struct charset_info_st my_charset_utf8_latvian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_romanian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_romanian_uca_ci=
{
195,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_romanian_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_romanian_ci", /* name */
"", /* comment */
romanian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35026,19 +35026,19 @@ struct charset_info_st my_charset_utf8_romanian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_slovenian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_slovenian_uca_ci=
{
196,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_slovenian_ci",/* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_slovenian_ci",/* name */
"", /* comment */
slovenian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35058,19 +35058,19 @@ struct charset_info_st my_charset_utf8_slovenian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_polish_uca_ci=
+struct charset_info_st my_charset_utf8mb3_polish_uca_ci=
{
197,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_polish_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_polish_ci",/* name */
"", /* comment */
polish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35090,19 +35090,19 @@ struct charset_info_st my_charset_utf8_polish_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_estonian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_estonian_uca_ci=
{
198,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_estonian_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_estonian_ci",/* name */
"", /* comment */
estonian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35122,19 +35122,19 @@ struct charset_info_st my_charset_utf8_estonian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_spanish_uca_ci=
+struct charset_info_st my_charset_utf8mb3_spanish_uca_ci=
{
199,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_spanish_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_spanish_ci", /* name */
"", /* comment */
spanish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35154,19 +35154,19 @@ struct charset_info_st my_charset_utf8_spanish_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_swedish_uca_ci=
+struct charset_info_st my_charset_utf8mb3_swedish_uca_ci=
{
200,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_swedish_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_swedish_ci", /* name */
"", /* comment */
swedish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35186,19 +35186,19 @@ struct charset_info_st my_charset_utf8_swedish_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_turkish_uca_ci=
+struct charset_info_st my_charset_utf8mb3_turkish_uca_ci=
{
201,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_turkish_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_turkish_ci", /* name */
"", /* comment */
turkish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35218,19 +35218,19 @@ struct charset_info_st my_charset_utf8_turkish_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_czech_uca_ci=
+struct charset_info_st my_charset_utf8mb3_czech_uca_ci=
{
202,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_czech_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_czech_ci", /* name */
"", /* comment */
czech, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35250,20 +35250,20 @@ struct charset_info_st my_charset_utf8_czech_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_danish_uca_ci=
+struct charset_info_st my_charset_utf8mb3_danish_uca_ci=
{
203,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_danish_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_danish_ci", /* name */
"", /* comment */
danish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35283,19 +35283,19 @@ struct charset_info_st my_charset_utf8_danish_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_lithuanian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_lithuanian_uca_ci=
{
204,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_lithuanian_ci",/* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_lithuanian_ci",/* name */
"", /* comment */
lithuanian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35315,19 +35315,19 @@ struct charset_info_st my_charset_utf8_lithuanian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_slovak_uca_ci=
+struct charset_info_st my_charset_utf8mb3_slovak_uca_ci=
{
205,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_slovak_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_slovak_ci",/* name */
"", /* comment */
slovak, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35347,19 +35347,19 @@ struct charset_info_st my_charset_utf8_slovak_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_spanish2_uca_ci=
+struct charset_info_st my_charset_utf8mb3_spanish2_uca_ci=
{
206,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_spanish2_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_spanish2_ci",/* name */
"", /* comment */
spanish2, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35379,19 +35379,19 @@ struct charset_info_st my_charset_utf8_spanish2_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_roman_uca_ci=
+struct charset_info_st my_charset_utf8mb3_roman_uca_ci=
{
207,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_roman_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_roman_ci",/* name */
"", /* comment */
roman, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35411,19 +35411,19 @@ struct charset_info_st my_charset_utf8_roman_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_persian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_persian_uca_ci=
{
208,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_persian_ci", /* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_persian_ci",/* name */
"", /* comment */
persian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35443,19 +35443,19 @@ struct charset_info_st my_charset_utf8_persian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_esperanto_uca_ci=
+struct charset_info_st my_charset_utf8mb3_esperanto_uca_ci=
{
209,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_esperanto_ci",/* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_esperanto_ci",/* name */
"", /* comment */
esperanto, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35475,19 +35475,19 @@ struct charset_info_st my_charset_utf8_esperanto_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_hungarian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_hungarian_uca_ci=
{
210,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_hungarian_ci",/* name */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_hungarian_ci",/* name */
"", /* comment */
hungarian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35507,19 +35507,19 @@ struct charset_info_st my_charset_utf8_hungarian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_sinhala_uca_ci=
+struct charset_info_st my_charset_utf8mb3_sinhala_uca_ci=
{
211,0,0, /* number */
- MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
- "utf8", /* cs name */
- "utf8_sinhala_ci", /* name */
+ MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
+ MY_UTF8MB3, /* cs name */
+ MY_UTF8MB3 "_sinhala_ci", /* name */
"", /* comment */
sinhala, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35539,20 +35539,20 @@ struct charset_info_st my_charset_utf8_sinhala_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_german2_uca_ci=
+struct charset_info_st my_charset_utf8mb3_german2_uca_ci=
{
212,0,0, /* number */
- MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
+ MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
MY_UTF8MB3, /* cs name */
- MY_UTF8MB3 "_german2_ci",/* name */
+ MY_UTF8MB3 "_german2_ci",/* name */
"", /* comment */
german2, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35572,19 +35572,19 @@ struct charset_info_st my_charset_utf8_german2_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_croatian_mysql561_uca_ci=
+struct charset_info_st my_charset_utf8mb3_croatian_mysql561_uca_ci=
{
213,0,0, /* number */
- MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
+ MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
MY_UTF8MB3, /* cs name */
MY_UTF8MB3 "_croatian_mysql561_ci",/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35604,20 +35604,20 @@ struct charset_info_st my_charset_utf8_croatian_mysql561_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_croatian_uca_ci=
+struct charset_info_st my_charset_utf8mb3_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8,0,0, /* number */
- MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
+ MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
MY_UTF8MB3, /* cs name */
MY_UTF8MB3 "_croatian_ci",/* name */
"", /* comment */
croatian_mariadb, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35637,20 +35637,20 @@ struct charset_info_st my_charset_utf8_croatian_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_myanmar_uca_ci=
+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 */
+ MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
MY_UTF8MB3, /* cs name */
- MY_UTF8MB3 "_myanmar_ci",/* name */
+ MY_UTF8MB3 "_myanmar_ci",/* name */
"", /* comment */
myanmar, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35670,12 +35670,12 @@ struct charset_info_st my_charset_utf8_myanmar_uca_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_unicode_520_ci=
+struct charset_info_st my_charset_utf8mb3_unicode_520_ci=
{
214,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
@@ -35683,7 +35683,7 @@ struct charset_info_st my_charset_utf8_unicode_520_ci=
MY_UTF8MB3 "_unicode_520_ci",/* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35703,11 +35703,11 @@ struct charset_info_st my_charset_utf8_unicode_520_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_thai_520_w2=
+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 */
@@ -35715,7 +35715,7 @@ struct charset_info_st my_charset_utf8_thai_520_w2=
MY_UTF8MB3 "_thai_520_w2",/* name */
"", /* comment */
"[strength 2]", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35735,11 +35735,11 @@ struct charset_info_st my_charset_utf8_thai_520_w2=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
2, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_multilevel_utf8mb3
};
-struct charset_info_st my_charset_utf8_vietnamese_ci=
+struct charset_info_st my_charset_utf8mb3_vietnamese_ci=
{
215,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
@@ -35747,7 +35747,7 @@ struct charset_info_st my_charset_utf8_vietnamese_ci=
MY_UTF8MB3 "_vietnamese_ci",/* name */
"", /* comment */
vietnamese, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35767,12 +35767,12 @@ struct charset_info_st my_charset_utf8_vietnamese_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_utf8mb3
};
-struct charset_info_st my_charset_utf8_unicode_nopad_ci=
+struct charset_info_st my_charset_utf8mb3_unicode_nopad_ci=
{
MY_NOPAD_ID(192),0,0, /* number */
MY_CS_UTF8MB3_UCA_NOPAD_FLAGS, /* flags */
@@ -35780,7 +35780,7 @@ struct charset_info_st my_charset_utf8_unicode_nopad_ci=
MY_UTF8MB3 "_unicode_nopad_ci",/* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35800,12 +35800,12 @@ struct charset_info_st my_charset_utf8_unicode_nopad_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_nopad_utf8mb3
};
-struct charset_info_st my_charset_utf8_unicode_520_nopad_ci=
+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 */
@@ -35813,7 +35813,7 @@ struct charset_info_st my_charset_utf8_unicode_520_nopad_ci=
MY_UTF8MB3 "_unicode_520_nopad_ci", /* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35833,11 +35833,11 @@ struct charset_info_st my_charset_utf8_unicode_520_nopad_ci=
' ', /* pad char */
0, /* escape_with_backslash_is_dangerous */
1, /* levels_for_order */
- &my_charset_utf8_handler,
+ &my_charset_utf8mb3_handler,
&my_uca_collation_handler_nopad_utf8mb3
};
-#endif /* HAVE_CHARSET_utf8 */
+#endif /* HAVE_CHARSET_utf8mb3 */
#ifdef HAVE_CHARSET_utf8mb4
@@ -35883,12 +35883,12 @@ extern MY_CHARSET_HANDLER my_charset_utf8mb4_handler;
struct charset_info_st my_charset_utf8mb4_unicode_ci=
{
224,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_unicode_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_unicode_ci",/* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35916,12 +35916,12 @@ struct charset_info_st my_charset_utf8mb4_unicode_ci=
struct charset_info_st my_charset_utf8mb4_icelandic_uca_ci=
{
225,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_icelandic_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_icelandic_ci",/* name */
"", /* comment */
icelandic, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35953,7 +35953,7 @@ struct charset_info_st my_charset_utf8mb4_latvian_uca_ci=
MY_UTF8MB4 "_latvian_ci", /* name */
"", /* comment */
latvian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -35980,12 +35980,12 @@ struct charset_info_st my_charset_utf8mb4_latvian_uca_ci=
struct charset_info_st my_charset_utf8mb4_romanian_uca_ci=
{
227,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_romanian_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_romanian_ci", /* name */
"", /* comment */
romanian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36012,12 +36012,12 @@ struct charset_info_st my_charset_utf8mb4_romanian_uca_ci=
struct charset_info_st my_charset_utf8mb4_slovenian_uca_ci=
{
228,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_slovenian_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_slovenian_ci",/* name */
"", /* comment */
slovenian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36044,12 +36044,12 @@ struct charset_info_st my_charset_utf8mb4_slovenian_uca_ci=
struct charset_info_st my_charset_utf8mb4_polish_uca_ci=
{
229,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_polish_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_polish_ci", /* name */
"", /* comment */
polish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36081,7 +36081,7 @@ struct charset_info_st my_charset_utf8mb4_estonian_uca_ci=
MY_UTF8MB4 "_estonian_ci", /* name */
"", /* comment */
estonian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36108,12 +36108,12 @@ struct charset_info_st my_charset_utf8mb4_estonian_uca_ci=
struct charset_info_st my_charset_utf8mb4_spanish_uca_ci=
{
231,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_spanish_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_spanish_ci", /* name */
"", /* comment */
spanish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36140,12 +36140,12 @@ struct charset_info_st my_charset_utf8mb4_spanish_uca_ci=
struct charset_info_st my_charset_utf8mb4_swedish_uca_ci=
{
232,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_swedish_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_swedish_ci", /* name */
"", /* comment */
swedish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36172,12 +36172,12 @@ struct charset_info_st my_charset_utf8mb4_swedish_uca_ci=
struct charset_info_st my_charset_utf8mb4_turkish_uca_ci=
{
233,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_turkish_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_turkish_ci", /* name */
"", /* comment */
turkish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36204,12 +36204,12 @@ struct charset_info_st my_charset_utf8mb4_turkish_uca_ci=
struct charset_info_st my_charset_utf8mb4_czech_uca_ci=
{
234,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_czech_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_czech_ci", /* name */
"", /* comment */
czech, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36237,12 +36237,12 @@ struct charset_info_st my_charset_utf8mb4_czech_uca_ci=
struct charset_info_st my_charset_utf8mb4_danish_uca_ci=
{
235,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_danish_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_danish_ci", /* name */
"", /* comment */
danish, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36269,12 +36269,12 @@ struct charset_info_st my_charset_utf8mb4_danish_uca_ci=
struct charset_info_st my_charset_utf8mb4_lithuanian_uca_ci=
{
236,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_lithuanian_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_lithuanian_ci",/* name */
"", /* comment */
lithuanian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36301,12 +36301,12 @@ struct charset_info_st my_charset_utf8mb4_lithuanian_uca_ci=
struct charset_info_st my_charset_utf8mb4_slovak_uca_ci=
{
237,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_slovak_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_slovak_ci", /* name */
"", /* comment */
slovak, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36333,12 +36333,12 @@ struct charset_info_st my_charset_utf8mb4_slovak_uca_ci=
struct charset_info_st my_charset_utf8mb4_spanish2_uca_ci=
{
238,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_spanish2_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_spanish2_ci", /* name */
"", /* comment */
spanish2, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36365,12 +36365,12 @@ struct charset_info_st my_charset_utf8mb4_spanish2_uca_ci=
struct charset_info_st my_charset_utf8mb4_roman_uca_ci=
{
239,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_roman_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_roman_ci", /* name */
"", /* comment */
roman, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36397,12 +36397,12 @@ struct charset_info_st my_charset_utf8mb4_roman_uca_ci=
struct charset_info_st my_charset_utf8mb4_persian_uca_ci=
{
240,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_persian_ci", /* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_persian_ci", /* name */
"", /* comment */
persian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36429,12 +36429,12 @@ struct charset_info_st my_charset_utf8mb4_persian_uca_ci=
struct charset_info_st my_charset_utf8mb4_esperanto_uca_ci=
{
241,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_esperanto_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_esperanto_ci",/* name */
"", /* comment */
esperanto, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36461,12 +36461,12 @@ struct charset_info_st my_charset_utf8mb4_esperanto_uca_ci=
struct charset_info_st my_charset_utf8mb4_hungarian_uca_ci=
{
242,0,0, /* number */
- MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_hungarian_ci",/* name */
+ MY_CS_UTF8MB4_UCA_FLAGS,/* state */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_hungarian_ci",/* name */
"", /* comment */
hungarian, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36494,11 +36494,11 @@ struct charset_info_st my_charset_utf8mb4_sinhala_uca_ci=
{
243,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_sinhala_ci",/* name */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_sinhala_ci",/* name */
"", /* comment */
sinhala, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36526,11 +36526,11 @@ struct charset_info_st my_charset_utf8mb4_german2_uca_ci=
{
244,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_german2_ci",/* name */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_german2_ci",/* name */
"", /* comment */
german2, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36562,7 +36562,7 @@ struct charset_info_st my_charset_utf8mb4_croatian_mysql561_uca_ci=
MY_UTF8MB4 "_croatian_mysql561_ci",/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36591,11 +36591,11 @@ struct charset_info_st my_charset_utf8mb4_croatian_uca_ci=
{
MY_PAGE2_COLLATION_ID_UTF8MB4,0,0, /* number */
MY_CS_UTF8MB4_UCA_FLAGS,/* state */
- MY_UTF8MB4, /* csname */
+ MY_UTF8MB4, /* csname */
MY_UTF8MB4 "_croatian_ci",/* name */
"", /* comment */
croatian_mariadb, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36624,11 +36624,11 @@ 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 */
- MY_UTF8MB4, /* csname */
- MY_UTF8MB4 "_myanmar_ci",/* name */
+ MY_UTF8MB4, /* csname */
+ MY_UTF8MB4 "_myanmar_ci",/* name */
"", /* comment */
myanmar, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36660,7 +36660,7 @@ struct charset_info_st my_charset_utf8mb4_thai_520_w2=
MY_UTF8MB4 "_thai_520_w2", /* name */
"", /* comment */
"[strength 2]", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36692,7 +36692,7 @@ struct charset_info_st my_charset_utf8mb4_unicode_520_ci=
MY_UTF8MB4 "_unicode_520_ci",/* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36725,7 +36725,7 @@ struct charset_info_st my_charset_utf8mb4_vietnamese_ci=
MY_UTF8MB4 "_vietnamese_ci",/* name */
"", /* comment */
vietnamese, /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36758,7 +36758,7 @@ struct charset_info_st my_charset_utf8mb4_unicode_nopad_ci=
MY_UTF8MB4 "_unicode_nopad_ci", /* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -36791,7 +36791,7 @@ struct charset_info_st my_charset_utf8mb4_unicode_520_nopad_ci=
MY_UTF8MB4 "_unicode_520_nopad_ci", /* name */
"", /* comment */
"", /* tailoring */
- ctype_utf8, /* ctype */
+ ctype_utf8mb3, /* ctype */
NULL, /* to_lower */
NULL, /* to_upper */
NULL, /* sort_order */
@@ -37482,7 +37482,7 @@ struct charset_info_st my_charset_utf32_german2_uca_ci=
{
180,0,0, /* number */
MY_CS_UTF32_UCA_FLAGS,/* state */
- "utf32", /* csname */
+ "utf32", /* csname */
"utf32_german2_ci", /* name */
"", /* comment */
german2, /* tailoring */
View Lorry Controller Status