mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-8334: Rename utf8 to utf8mb3

Browse source 
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
This commit is contained in:
Rucha Deodhar 2021-02-15 01:39:37 +05:30 • committed by Oleksandr Byelkin
commit 2fdb556e04
415 changed files with 8048 additions and 7826 deletions
Download patch file Download diff file Expand all files Collapse all files

58
strings/ctype-uca.c
View file

@ -34905,7 +34905,7 @@ struct charset_info_st my_charset_utf8mb3_unicode_ci=
{
192,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_unicode_ci", /* name */
"", /* comment */
"", /* tailoring */
@ -34938,7 +34938,7 @@ struct charset_info_st my_charset_utf8mb3_icelandic_uca_ci=
{
193,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_icelandic_ci",/* name */
"", /* comment */
icelandic, /* tailoring */
@ -34970,7 +34970,7 @@ struct charset_info_st my_charset_utf8mb3_latvian_uca_ci=
{
194,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_latvian_ci",/* name */
"", /* comment */
latvian, /* tailoring */
@ -35002,7 +35002,7 @@ struct charset_info_st my_charset_utf8mb3_romanian_uca_ci=
{
195,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_romanian_ci", /* name */
"", /* comment */
romanian, /* tailoring */
@ -35034,7 +35034,7 @@ struct charset_info_st my_charset_utf8mb3_slovenian_uca_ci=
{
196,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_slovenian_ci",/* name */
"", /* comment */
slovenian, /* tailoring */
@ -35066,7 +35066,7 @@ struct charset_info_st my_charset_utf8mb3_polish_uca_ci=
{
197,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_polish_ci",/* name */
"", /* comment */
polish, /* tailoring */
@ -35098,7 +35098,7 @@ struct charset_info_st my_charset_utf8mb3_estonian_uca_ci=
{
198,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_estonian_ci",/* name */
"", /* comment */
estonian, /* tailoring */
@ -35130,7 +35130,7 @@ struct charset_info_st my_charset_utf8mb3_spanish_uca_ci=
{
199,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_spanish_ci", /* name */
"", /* comment */
spanish, /* tailoring */
@ -35162,7 +35162,7 @@ struct charset_info_st my_charset_utf8mb3_swedish_uca_ci=
{
200,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_swedish_ci", /* name */
"", /* comment */
swedish, /* tailoring */
@ -35194,7 +35194,7 @@ struct charset_info_st my_charset_utf8mb3_turkish_uca_ci=
{
201,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_turkish_ci", /* name */
"", /* comment */
turkish, /* tailoring */
@ -35226,7 +35226,7 @@ struct charset_info_st my_charset_utf8mb3_czech_uca_ci=
{
202,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_czech_ci", /* name */
"", /* comment */
czech, /* tailoring */
@ -35259,7 +35259,7 @@ struct charset_info_st my_charset_utf8mb3_danish_uca_ci=
{
203,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_danish_ci", /* name */
"", /* comment */
danish, /* tailoring */
@ -35291,7 +35291,7 @@ struct charset_info_st my_charset_utf8mb3_lithuanian_uca_ci=
{
204,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_lithuanian_ci",/* name */
"", /* comment */
lithuanian, /* tailoring */
@ -35323,7 +35323,7 @@ struct charset_info_st my_charset_utf8mb3_slovak_uca_ci=
{
205,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_slovak_ci",/* name */
"", /* comment */
slovak, /* tailoring */
@ -35355,7 +35355,7 @@ struct charset_info_st my_charset_utf8mb3_spanish2_uca_ci=
{
206,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_spanish2_ci",/* name */
"", /* comment */
spanish2, /* tailoring */
@ -35387,7 +35387,7 @@ struct charset_info_st my_charset_utf8mb3_roman_uca_ci=
{
207,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_roman_ci",/* name */
"", /* comment */
roman, /* tailoring */
@ -35419,7 +35419,7 @@ struct charset_info_st my_charset_utf8mb3_persian_uca_ci=
{
208,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_persian_ci",/* name */
"", /* comment */
persian, /* tailoring */
@ -35451,7 +35451,7 @@ struct charset_info_st my_charset_utf8mb3_esperanto_uca_ci=
{
209,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_esperanto_ci",/* name */
"", /* comment */
esperanto, /* tailoring */
@ -35483,7 +35483,7 @@ struct charset_info_st my_charset_utf8mb3_hungarian_uca_ci=
{
210,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_hungarian_ci",/* name */
"", /* comment */
hungarian, /* tailoring */
@ -35515,7 +35515,7 @@ struct charset_info_st my_charset_utf8mb3_sinhala_uca_ci=
{
211,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_sinhala_ci", /* name */
"", /* comment */
sinhala, /* tailoring */
@ -35548,7 +35548,7 @@ struct charset_info_st my_charset_utf8mb3_german2_uca_ci=
{
212,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_german2_ci",/* name */
"", /* comment */
german2, /* tailoring */
@ -35580,7 +35580,7 @@ struct charset_info_st my_charset_utf8mb3_croatian_mysql561_uca_ci=
{
213,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_croatian_mysql561_ci",/* name */
"", /* comment */
croatian_mysql561, /* tailoring */
@ -35613,7 +35613,7 @@ 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_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_croatian_ci",/* name */
"", /* comment */
croatian_mariadb, /* tailoring */
@ -35646,7 +35646,7 @@ 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_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_myanmar_ci",/* name */
"", /* comment */
myanmar, /* tailoring */
@ -35679,7 +35679,7 @@ struct charset_info_st my_charset_utf8mb3_unicode_520_ci=
{
214,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* csname */
charset_name_utf8mb3, /* csname */
MY_UTF8MB3 "_unicode_520_ci",/* name */
"", /* comment */
"", /* tailoring */
@ -35711,7 +35711,7 @@ 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_utf8, /* csname */
charset_name_utf8mb3, /* csname */
MY_UTF8MB3 "_thai_520_w2",/* name */
"", /* comment */
"[strength 2]", /* tailoring */
@ -35743,7 +35743,7 @@ struct charset_info_st my_charset_utf8mb3_vietnamese_ci=
{
215,0,0, /* number */
MY_CS_UTF8MB3_UCA_FLAGS,/* flags */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_vietnamese_ci",/* name */
"", /* comment */
vietnamese, /* tailoring */
@ -35776,7 +35776,7 @@ 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_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_unicode_nopad_ci",/* name */
"", /* comment */
"", /* tailoring */
@ -35809,7 +35809,7 @@ 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_utf8, /* csname */
charset_name_utf8mb3, /* csname */
MY_UTF8MB3 "_unicode_520_nopad_ci", /* name */
"", /* comment */
"", /* tailoring */

12
strings/ctype-utf8.c
View file

@ -5473,7 +5473,7 @@ struct charset_info_st my_charset_utf8mb3_general_ci=
{
33,0,0, /* number */
MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE, /* state */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_general_ci", /* name */
"", /* comment */
NULL, /* tailoring */
@ -5506,7 +5506,7 @@ struct charset_info_st my_charset_utf8mb3_general_mysql500_ci=
{
223,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE, /* state */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_general_mysql500_ci", /* name */
"", /* comment */
NULL, /* tailoring */
@ -5539,7 +5539,7 @@ struct charset_info_st my_charset_utf8mb3_bin=
{
83,0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_BINSORT|MY_CS_UNICODE, /* state */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_bin", /* name */
"", /* comment */
NULL, /* tailoring */
@ -5572,7 +5572,7 @@ struct charset_info_st my_charset_utf8mb3_general_nopad_ci=
{
MY_NOPAD_ID(33),0,0, /* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NOPAD, /* state */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_general_nopad_ci", /* name */
"", /* comment */
NULL, /* tailoring */
@ -5605,7 +5605,7 @@ struct charset_info_st my_charset_utf8mb3_nopad_bin=
{
MY_NOPAD_ID(83),0,0,/* number */
MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NOPAD,
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_nopad_bin", /* name */
"", /* comment */
NULL, /* tailoring */
@ -5767,7 +5767,7 @@ struct charset_info_st my_charset_utf8mb3_general_cs=
{
254,0,0, /* number */
MY_CS_COMPILED|MY_CS_UNICODE, /* state */
charset_name_utf8, /* cs name */
charset_name_utf8mb3, /* cs name */
MY_UTF8MB3 "_general_cs", /* name */
"", /* comment */
NULL, /* tailoring */

2
strings/ctype.c
View file

@ -37,7 +37,7 @@
*/
const char charset_name_latin2[]= "latin2";
const char charset_name_utf8[]= "utf8";
const char charset_name_utf8mb3[]= "utf8mb3";
const char charset_name_utf16[]= "utf16";
const char charset_name_utf32[]= "utf32";
const char charset_name_ucs2[]= "ucs2";

2
strings/strings_def.h
View file

@ -132,7 +132,7 @@ int my_wc_to_printable_8bit(CHARSET_INFO *cs, my_wc_t wc,
/* Some common character set names */
extern const char charset_name_latin2[];
extern const char charset_name_utf8[];
extern const char charset_name_utf8mb3[];
extern const char charset_name_utf16[];
extern const char charset_name_utf32[];
extern const char charset_name_ucs2[];