database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
strings/CMakeLists.txt
View File

@@ -20,7 +20,8 @@ ${CMAKE_BINARY_DIR}/strings
SET(STRINGS_SOURCES bchange.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c
ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c
ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c
ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c
ctype-uca.c ctype-uca0900.c ctype-uca1400.c
ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c dtoa.c int2str.c
ctype-unidata.c
is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c

12
strings/ctype-big5.c
View File

@@ -6729,7 +6729,8 @@ static MY_COLLATION_HANDLER my_collation_handler_big5_chinese_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6749,7 +6750,8 @@ static MY_COLLATION_HANDLER my_collation_handler_big5_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6769,7 +6771,8 @@ static MY_COLLATION_HANDLER my_collation_handler_big5_chinese_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6789,7 +6792,8 @@ static MY_COLLATION_HANDLER my_collation_handler_big5_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

9
strings/ctype-bin.c
View File

@@ -526,7 +526,8 @@ MY_COLLATION_HANDLER my_collation_8bit_bin_handler =
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -546,7 +547,8 @@ MY_COLLATION_HANDLER my_collation_8bit_nopad_bin_handler =
my_min_str_8bit_simple_nopad,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -566,7 +568,8 @@ static MY_COLLATION_HANDLER my_collation_binary_handler =
my_min_str_8bit_simple_nopad,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-cp932.c
View File

@@ -34686,7 +34686,8 @@ static MY_COLLATION_HANDLER my_collation_handler_cp932_japanese_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34706,7 +34707,8 @@ static MY_COLLATION_HANDLER my_collation_handler_cp932_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34726,7 +34728,8 @@ static MY_COLLATION_HANDLER my_collation_handler_cp932_japanese_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34746,7 +34749,8 @@ static MY_COLLATION_HANDLER my_collation_handler_cp932_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

3
strings/ctype-czech.c
View File

@@ -608,7 +608,8 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_cs_handler =
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
struct charset_info_st my_charset_latin2_czech_cs =

12
strings/ctype-euc_kr.c
View File

@@ -9976,7 +9976,8 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_korean_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -9996,7 +9997,8 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -10016,7 +10018,8 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_korean_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -10036,7 +10039,8 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-eucjpms.c
View File

@@ -67514,7 +67514,8 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_japanese_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67534,7 +67535,8 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67554,7 +67556,8 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_japanese_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67574,7 +67577,8 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-gb2312.c
View File

@@ -6380,7 +6380,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gb2312_chinese_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6400,7 +6401,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gb2312_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6420,7 +6422,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gb2312_chinese_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -6440,7 +6443,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gb2312_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-gbk.c
View File

@@ -10662,7 +10662,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gbk_chinese_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -10682,7 +10683,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gbk_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -10702,7 +10704,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gbk_chinese_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -10722,7 +10725,8 @@ static MY_COLLATION_HANDLER my_collation_handler_gbk_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
static MY_CHARSET_HANDLER my_charset_handler=

3
strings/ctype-latin1.c
View File

@@ -754,7 +754,8 @@ static MY_COLLATION_HANDLER my_collation_german2_ci_handler=
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

6
strings/ctype-simple.c
View File

@@ -2220,7 +2220,8 @@ MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler =
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -2240,5 +2241,6 @@ MY_COLLATION_HANDLER my_collation_8bit_simple_nopad_ci_handler =
my_min_str_8bit_simple_nopad,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-sjis.c
View File

@@ -34074,7 +34074,8 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_japanese_ci=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34094,7 +34095,8 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_bin=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34114,7 +34116,8 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_japanese_nopad_ci=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -34134,7 +34137,8 @@ static MY_COLLATION_HANDLER my_collation_handler_sjis_nopad_bin=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

6
strings/ctype-tis620.c
View File

@@ -897,7 +897,8 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
static MY_COLLATION_HANDLER my_collation_nopad_ci_handler =
@@ -916,7 +917,8 @@ static MY_COLLATION_HANDLER my_collation_nopad_ci_handler =
my_min_str_8bit_simple_nopad,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
static MY_CHARSET_HANDLER my_charset_handler=

422
strings/ctype-uca.c
View File

@@ -34,8 +34,8 @@
#include "strings_def.h"
#include <m_ctype.h>
#include <my_sys.h>
#include "ctype-uca.h"
#include "ctype-uca0520.h"
#include "ctype-unidata.h"
#include "my_bit.h"
@@ -30214,78 +30214,6 @@ MY_UCA_INFO my_uca_v520=
};
#include "ctype-uca1400data.h"
static MY_UCA_INFO my_uca_v1400=
{
{
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length,
(uint16 **) uca1400_weight,
{ /* Contractions: */
array_elements(uca1400_contractions), /* nitems */
uca1400_contractions, /* item */
NULL /* flags */
},
0, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
},
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length_secondary,
(uint16 **) uca1400_weight_secondary,
{ /* Contractions: */
array_elements(uca1400_contractions_secondary), /* nitems */
uca1400_contractions_secondary, /* item */
NULL /* flags */
},
1, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
},
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length_tertiary,
(uint16 **) uca1400_weight_tertiary,
{ /* Contractions: */
array_elements(uca1400_contractions_tertiary), /* nitems */
uca1400_contractions_tertiary, /* item */
NULL /* flags */
},
2, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
}
},
uca1400_non_ignorable_first,
uca1400_non_ignorable_last,
uca1400_primary_ignorable_first,
uca1400_primary_ignorable_last,
uca1400_secondary_ignorable_first,
uca1400_secondary_ignorable_last,
uca1400_tertiary_ignorable_first,
uca1400_tertiary_ignorable_last,
0x0000, /* first_trailing */
0x0000, /* last_trailing */
uca1400_variable_first,
uca1400_variable_last,
/* Misc */
uca1400_version
};
/******************************************************/
/*
@@ -31247,25 +31175,12 @@ static const char myanmar[]= "[shift-after-method expand]"
;
typedef struct my_uca1400_collation_definition_st
{
const char * tailoring;
const char * name;
uint16 id_utf8mb3;
uint16 id_utf8mb4;
uint16 id_ucs2;
uint16 id_utf16;
uint16 id_utf32;
} MY_UCA1400_COLLATION_DEFINITION;
/*
UCA1400 collation definitions in the order of their UCA400 counterparts,
with IDs of their closest UCA1400 counterparts, for character sets
utf8mb3, utf8mb4, ucs2, utf16, utf32.
*/
static MY_UCA1400_COLLATION_DEFINITION
MY_UCA1400_COLLATION_DEFINITION
my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]=
{
#define COLDEF(tl,name,id_utf8mb3,id_utf8mb4,id_ucs2,id_utf16,id_utf32) \
@@ -31309,9 +31224,17 @@ my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]=
};
static MY_UCA_INFO
my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1]
[MY_UCA1400_COLLATION_DEFINITION_COUNT];
static my_bool
my_ci_eq_collation_uca(CHARSET_INFO *a, CHARSET_INFO *b)
{
return a->cset == b->cset &&
a->coll == b->coll &&
a->uca == b->uca &&
a->casefold == b->casefold &&
(a->state & MY_CS_NOPAD) == (b->state & MY_CS_NOPAD) &&
a->levels_for_order == b->levels_for_order &&
a->tailoring == b->tailoring;
}
typedef struct my_uca_scanner_param_st
@@ -34597,6 +34520,30 @@ my_uca_info_init(MY_CHARSET_LOADER *loader,
}
/*
Initialize (if needed) an element of the array my_uca1400_info_tailored[].
UCA1400 collations with equal character set and tailoring
(but with different level flags) share the same MY_UCA_INFO.
*/
static MY_UCA_INFO *
my_uca1400_collation_get_initialized_shared_uca(MY_CHARSET_LOADER *loader,
struct charset_info_st *cs,
MY_COLL_RULES *rules,
const MY_UCA_INFO *src_uca,
uint id)
{
my_cs_encoding_t enc= my_uca1400_collation_id_to_charset_id(id);
uint tailoring= my_uca1400_collation_id_to_tailoring_id(id);
MY_UCA_INFO *dst_uca= &my_uca1400_info_tailored[enc][tailoring];
DBUG_ASSERT(my_collation_id_is_uca1400(id));
if (!dst_uca->level[0].weights/*Check if already initialized*/ &&
(my_uca_info_init(loader, dst_uca, rules, cs, src_uca,
(1<<MY_UCA_WEIGHT_LEVELS)-1)))
return NULL; /* EOM or an error in rules */
return dst_uca;
}
/*
This function copies an UCS2 collation from
the default Unicode Collation Algorithm (UCA)
@@ -34664,20 +34611,23 @@ create_tailoring(struct charset_info_st *cs,
my_ci_set_strength(cs, 1);
if (my_collation_id_is_uca1400(cs->number))
if (my_collation_id_is_mysql_uca0900(cs->number))
{
/*
UCA1400 collations with equal character set and tailoring
(but with different level flags) share the same MY_UCA_INFO.
*/
my_cs_encoding_t enc= my_uca1400_collation_id_to_charset_id(cs->number);
uint tailoring= my_uca1400_collation_id_to_tailoring_id(cs->number);
MY_UCA_INFO *dst_uca= &my_uca1400_info_tailored[enc][tailoring];
if (!dst_uca->level[0].weights &&
(rc= my_uca_info_init(loader, dst_uca, &rules, cs, src_uca,
(1<<MY_UCA_WEIGHT_LEVELS)-1)))
goto ex;
cs->uca= dst_uca;
uint id1400= mysql_0900_mapping[cs->number - mysql_0900_collation_start].
collation_id;
if (!(cs->uca= my_uca1400_collation_get_initialized_shared_uca(loader, cs,
&rules,
src_uca,
id1400)))
goto ex;
}
else if (my_collation_id_is_uca1400(cs->number))
{
if (!(cs->uca= my_uca1400_collation_get_initialized_shared_uca(loader, cs,
&rules,
src_uca,
cs->number)))
goto ex;
}
else
{
@@ -39272,122 +39222,6 @@ struct charset_info_st my_charset_utf16_unicode_520_nopad_ci=
#endif /* HAVE_CHARSET_utf16 */
uint
my_uca1400_make_builtin_collation_id(my_cs_encoding_t charset_id,
uint tailoring_id,
my_bool nopad,
my_bool secondary_level,
my_bool tertiary_level)
{
if (!my_uca1400_collation_definitions[tailoring_id].tailoring)
return 0;
return MY_UCA1400_COLLATION_ID_POSSIBLE_MIN +
(charset_id << 8) +
(tailoring_id << 3) +
(nopad << 2) +
(secondary_level << 1) +
(tertiary_level << 0);
}
my_bool
my_uca1400_collation_definition_init(MY_CHARSET_LOADER *loader,
struct charset_info_st *dst,
uint id)
{
my_cs_encoding_t cs_id= my_uca1400_collation_id_to_charset_id(id);
uint tailoring_id= my_uca1400_collation_id_to_tailoring_id(id);
my_bool nopad= my_uca1400_collation_id_to_nopad_flag(id);
my_bool secondary_level= my_uca1400_collation_id_to_secondary_level_flag(id);
my_bool tertiary_level= my_uca1400_collation_id_to_tertiary_level_flag(id);
const MY_UCA1400_COLLATION_DEFINITION *def=
&my_uca1400_collation_definitions[tailoring_id];
char tmp[128], *coll_name;
size_t length;
switch (cs_id) {
case MY_CS_ENCODING_UTF8MB3:
*dst= nopad ? my_charset_utf8mb3_unicode_520_nopad_ci :
my_charset_utf8mb3_unicode_520_ci;
break;
case MY_CS_ENCODING_UTF8MB4:
*dst= nopad ? my_charset_utf8mb4_unicode_520_nopad_ci :
my_charset_utf8mb4_unicode_520_ci;
break;
#ifdef HAVE_CHARSET_ucs2
case MY_CS_ENCODING_UCS2:
*dst= nopad ? my_charset_ucs2_unicode_520_nopad_ci :
my_charset_ucs2_unicode_520_ci;
break;
#endif
#ifdef HAVE_CHARSET_utf16
case MY_CS_ENCODING_UTF16:
*dst= nopad ? my_charset_utf16_unicode_520_nopad_ci :
my_charset_utf16_unicode_520_ci;
break;
#endif
#ifdef HAVE_CHARSET_utf32
case MY_CS_ENCODING_UTF32:
*dst= nopad ? my_charset_utf32_unicode_520_nopad_ci :
my_charset_utf32_unicode_520_ci;
break;
#endif
}
dst->number= id;
dst->uca= &my_uca_v1400;
dst->tailoring= def->tailoring;
if (def->tailoring == turkish)
dst->casefold= &my_casefold_unicode1400tr;
else
dst->casefold= &my_casefold_unicode1400;
if (nopad)
dst->state|= MY_CS_NOPAD;
my_ci_set_level_flags(dst, (1 << MY_CS_LEVEL_BIT_PRIMARY) |
(secondary_level ?
1 << MY_CS_LEVEL_BIT_SECONDARY : 0) |
(tertiary_level ?
1 << MY_CS_LEVEL_BIT_TERTIARY : 0));
length= my_snprintf(tmp, sizeof(tmp), "%.*s_uca1400%s%s%s%s%s",
(int) dst->cs_name.length, dst->cs_name.str,
def->name[0] ? "_" : "",
def->name,
nopad ? "_nopad" : "",
secondary_level ? "_as" : "_ai",
tertiary_level ? "_cs" : "_ci");
if (!(coll_name= loader->once_alloc(length + 1)))
return TRUE;
strcpy(coll_name, tmp);
dst->coll_name.str= coll_name;
dst->coll_name.length= length;
return FALSE;
}
/*
Return UCA-4.0.0 compatible ID, e.g. for use in the protocol
with the old clients.
*/
static uint my_uca1400_collation_id_uca400_compat(uint id)
{
uint tlid= my_uca1400_collation_id_to_tailoring_id(id);
my_cs_encoding_t csid= my_uca1400_collation_id_to_charset_id(id);
MY_UCA1400_COLLATION_DEFINITION *def;
DBUG_ASSERT(my_collation_id_is_uca1400(id));
if (!(def= &my_uca1400_collation_definitions[tlid])->name)
return id;
switch (csid) {
case MY_CS_ENCODING_UTF8MB3: return def->id_utf8mb3;
case MY_CS_ENCODING_UTF8MB4: return def->id_utf8mb4;
case MY_CS_ENCODING_UCS2: return def->id_ucs2;
case MY_CS_ENCODING_UTF16: return def->id_utf16;
case MY_CS_ENCODING_UTF32: return def->id_utf32;
}
return id;
}
uint my_ci_get_id_uca(CHARSET_INFO *cs, my_collation_id_type_t type)
{
switch (type)
@@ -39407,23 +39241,6 @@ uint my_ci_get_id_uca(CHARSET_INFO *cs, my_collation_id_type_t type)
}
LEX_CSTRING my_ci_get_collation_name_uca1400_context(CHARSET_INFO *cs)
{
LEX_CSTRING res;
DBUG_ASSERT(my_collation_id_is_uca1400(cs->number));
if (cs->coll_name.length <= cs->cs_name.length ||
cs->coll_name.str[cs->cs_name.length] != '_')
{
DBUG_ASSERT(0);
return cs->coll_name;
}
res.str= cs->coll_name.str + cs->cs_name.length + 1;
res.length= cs->coll_name.length - cs->cs_name.length - 1;
return res;
}
LEX_CSTRING my_ci_get_collation_name_uca(CHARSET_INFO *cs,
my_collation_name_mode_t mode)
{
@@ -39440,137 +39257,4 @@ LEX_CSTRING my_ci_get_collation_name_uca(CHARSET_INFO *cs,
return cs->coll_name;
}
/*
Add support for MySQL 8.0 utf8mb4_0900_.. collations
The collation id's where collected from fprintf() in add_alias_for_collation()
*/
#define mysql_0900_collation_start 255
struct mysql_0900_to_mariadb_1400_mapping
{
const char *mysql_col_name, *mariadb_col_name, *case_sensitivity;
uint collation_id;
};
struct mysql_0900_to_mariadb_1400_mapping mysql_0900_mapping[]=
{
/* 255 Ascent insensitive, Case insensitive 'ai_ci' */
{"", "", "ai_ci", 2308},
{"de_pb", "german2", "ai_ci", 2468},
{"is", "icelandic", "ai_ci", 2316},
{"lv", "latvian", "ai_ci", 2324},
{"ro", "romanian", "ai_ci", 2332},
{"sl", "slovenian", "ai_ci", 2340},
{"pl", "polish", "ai_ci", 2348},
{"et", "estonian", "ai_ci", 2356},
{"es", "spanish", "ai_ci", 2364},
{"sv", "swedish", "ai_ci", 2372},
{"tr", "turkish", "ai_ci", 2380},
{"cs", "czech", "ai_ci", 2388},
{"da", "danish", "ai_ci", 2396},
{"lt", "lithuanian", "ai_ci", 2404},
{"sk", "slovak", "ai_ci", 2412},
{"es_trad", "spanish2", "ai_ci", 2420},
{"la", "roman", "ai_ci", 2428},
{"fa", NullS, "ai_ci", 0}, // Disabled in MySQL
{"eo", "esperanto", "ai_ci", 2444},
{"hu", "hungarian", "ai_ci", 2452},
{"hr", "croatian", "ai_ci", 2500},
{"si", NullS, "ai_ci", 0}, // Disabled in MySQL
{"vi", "vietnamese", "ai_ci", 2492},
/* 278 Ascent sensitive, Case sensitive 'as_cs' */
{"","", "as_cs", 2311},
{"de_pb", "german2", "as_cs", 2471},
{"is", "icelandic", "as_cs", 2319},
{"lv", "latvian", "as_cs", 2327},
{"ro", "romanian", "as_cs", 2335},
{"sl", "slovenian", "as_cs", 2343},
{"pl", "polish", "as_cs", 2351},
{"et", "estonian", "as_cs", 2359},
{"es", "spanish", "as_cs", 2367},
{"sv", "swedish", "as_cs", 2375},
{"tr", "turkish", "as_cs", 2383},
{"cs", "czech", "as_cs", 2391},
{"da", "danish", "as_cs", 2399},
{"lt", "lithuanian", "as_cs", 2407},
{"sk", "slovak", "as_cs", 2415},
{"es_trad", "spanish2", "as_cs", 2423},
{"la", "roman", "as_cs", 2431},
{"fa", NullS, "as_cs", 0}, // Disabled in MySQL
{"eo", "esperanto", "as_cs", 2447},
{"hu", "hungarian", "as_cs", 2455},
{"hr", "croatian", "as_cs", 2503},
{"si", NullS, "as_cs", 0}, // Disabled in MySQL
{"vi", "vietnamese", "as_cs", 2495},
{"", NullS, "as_cs", 0}, // Missing
{"", NullS, "as_cs", 0}, // Missing
{"_ja_0900_as_cs", NullS, "as_cs", 0}, // Not supported
{"_ja_0900_as_cs_ks", NullS, "as_cs", 0}, // Not supported
/* 305 Ascent-sensitive, Case insensitive 'as_ci' */
{"","", "as_ci", 2310},
{"ru", NullS, "ai_ci", 0}, // Not supported
{"ru", NullS, "as_cs", 0}, // Not supported
{"zh", NullS, "as_cs", 0}, // Not supported
{NullS, NullS, "", 0}
};
static LEX_CSTRING
mysql_utf8mb4_0900_bin= {STRING_WITH_LEN("utf8mb4_0900_bin")},
mariadb_utf8mb4_nopad_bin= {STRING_WITH_LEN("utf8mb4_nopad_bin")};
/*
Map mysql character sets to MariaDB using the same definition but with
with the MySQL collation name and id.
*/
my_bool mysql_utf8mb4_0900_collation_definitions_add()
{
uint id= mysql_0900_collation_start;
struct mysql_0900_to_mariadb_1400_mapping *map;
for (map= mysql_0900_mapping; map->mysql_col_name ; map++, id++)
{
if (map->mariadb_col_name) /* Supported collation */
{
size_t org_length, ali_length;
char original[64], alias[64];
LEX_CSTRING org_name, alias_name;
org_length= (strxnmov(original, sizeof(original)-1,
"utf8mb4_uca1400_",
map->mariadb_col_name,
(map->mariadb_col_name[0] ? "_" : ""),
"nopad_",
map->case_sensitivity,
NullS) - original);
ali_length= (strxnmov(alias, sizeof(alias)-1,
"utf8mb4_", map->mysql_col_name,
(map->mysql_col_name[0] ? "_" : ""),
"0900_",
map->case_sensitivity,
NullS) - alias);
org_name.str= original;
org_name.length= org_length;
alias_name.str= alias;
alias_name.length= ali_length;
if (add_alias_for_collation(&org_name, map->collation_id, &alias_name,
id))
return 1;
}
}
if (add_alias_for_collation(&mariadb_utf8mb4_nopad_bin, 1070,
&mysql_utf8mb4_0900_bin, 309))
return 1;
return 0;
}
#endif /* HAVE_UCA_COLLATIONS */

11
strings/ctype-uca.h
View File

@@ -118,9 +118,18 @@ typedef enum my_cs_encoding_enum
#define MY_CS_ENCODING_LAST MY_CS_ENCODING_UTF32
#include "ctype-uca1400.h"
typedef struct uca_collation_def_param
{
my_cs_encoding_t cs_id;
uint tailoring_id;
uint nopad_flags;
uint level_flags;
} uca_collation_def_param_t;
#include "ctype-uca1400.h"
#include "ctype-uca0900.h"
static inline MY_UCA_IMPLICIT_WEIGHT
my_uca_implicit_weight_primary(uint version, my_wc_t code)
{

12
strings/ctype-uca.inl
View File

@@ -1018,7 +1018,8 @@ MY_COLLATION_HANDLER MY_FUNCTION_NAME(collation_handler)=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_uca,
my_ci_get_collation_name_uca
my_ci_get_collation_name_uca,
my_ci_eq_collation_uca
};
@@ -1043,7 +1044,8 @@ MY_COLLATION_HANDLER MY_FUNCTION_NAME(collation_handler_nopad)=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_uca,
my_ci_get_collation_name_uca
my_ci_get_collation_name_uca,
my_ci_eq_collation_uca
};
@@ -1066,7 +1068,8 @@ MY_COLLATION_HANDLER MY_FUNCTION_NAME(collation_handler_multilevel)=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_uca,
my_ci_get_collation_name_uca
my_ci_get_collation_name_uca,
my_ci_eq_collation_uca
};
@@ -1089,7 +1092,8 @@ MY_COLLATION_HANDLER MY_FUNCTION_NAME(collation_handler_nopad_multilevel)=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_uca,
my_ci_get_collation_name_uca
my_ci_get_collation_name_uca,
my_ci_eq_collation_uca
};

69
strings/ctype-uca0520.h Normal file
View File

@@ -0,0 +1,69 @@
#ifndef CTYPE_UCA_0520_H
#define CTYPE_UCA_0520_H
/* Copyright (c) 2025, MariaDB Corporation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; version 2
of the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1335 USA */
extern struct charset_info_st my_charset_utf8mb3_unicode_520_nopad_ci;
extern struct charset_info_st my_charset_utf8mb3_unicode_520_ci;
extern struct charset_info_st my_charset_utf8mb4_unicode_520_nopad_ci;
extern struct charset_info_st my_charset_utf8mb4_unicode_520_ci;
extern struct charset_info_st my_charset_ucs2_unicode_520_nopad_ci;
extern struct charset_info_st my_charset_ucs2_unicode_520_ci;
extern struct charset_info_st my_charset_utf16_unicode_520_nopad_ci;
extern struct charset_info_st my_charset_utf16_unicode_520_ci;
extern struct charset_info_st my_charset_utf32_unicode_520_nopad_ci;
extern struct charset_info_st my_charset_utf32_unicode_520_ci;
extern struct charset_info_st my_charset_utf8mb4_turkish_uca_ci;
/*
Get a UCA-5.2.0 CHARSET_INFO using its character set ID and PAD flags.
Used to initialize UCA-14.0.0 collations.
*/
static inline
CHARSET_INFO *my_uca0520_builtin_collation_by_id(my_cs_encoding_t cs_id,
uint nopad_flags)
{
switch (cs_id) {
case MY_CS_ENCODING_UTF8MB3:
return nopad_flags ? &my_charset_utf8mb3_unicode_520_nopad_ci :
&my_charset_utf8mb3_unicode_520_ci;
case MY_CS_ENCODING_UTF8MB4:
return nopad_flags ? &my_charset_utf8mb4_unicode_520_nopad_ci :
&my_charset_utf8mb4_unicode_520_ci;
#ifdef HAVE_CHARSET_ucs2
case MY_CS_ENCODING_UCS2:
return nopad_flags ? &my_charset_ucs2_unicode_520_nopad_ci :
&my_charset_ucs2_unicode_520_ci;
#endif
#ifdef HAVE_CHARSET_utf16
case MY_CS_ENCODING_UTF16:
return nopad_flags ? &my_charset_utf16_unicode_520_nopad_ci :
&my_charset_utf16_unicode_520_ci;
#endif
#ifdef HAVE_CHARSET_utf32
case MY_CS_ENCODING_UTF32:
return nopad_flags ? &my_charset_utf32_unicode_520_nopad_ci :
&my_charset_utf32_unicode_520_ci;
#endif
}
return NULL;
}
#endif /* CTYPE_UCA_0520_H */

221
strings/ctype-uca0900.c Normal file
View File

@@ -0,0 +1,221 @@
/* Copyright (c) 2025, MariaDB Corporation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; version 2
of the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1335 USA */
#include "my_global.h"
#include "strings_def.h"
#include "ctype-uca.h"
struct mysql_0900_to_mariadb_1400_mapping
mysql_0900_mapping[mysql_0900_collation_num]=
{
/* 255 Ascent insensitive, Case insensitive 'ai_ci' */
{"", "", "ai_ci", 2308},
{"de_pb", "german2", "ai_ci", 2468},
{"is", "icelandic", "ai_ci", 2316},
{"lv", "latvian", "ai_ci", 2324},
{"ro", "romanian", "ai_ci", 2332},
{"sl", "slovenian", "ai_ci", 2340},
{"pl", "polish", "ai_ci", 2348},
{"et", "estonian", "ai_ci", 2356},
{"es", "spanish", "ai_ci", 2364},
{"sv", "swedish", "ai_ci", 2372},
{"tr", "turkish", "ai_ci", 2380},
{"cs", "czech", "ai_ci", 2388},
{"da", "danish", "ai_ci", 2396},
{"lt", "lithuanian", "ai_ci", 2404},
{"sk", "slovak", "ai_ci", 2412},
{"es_trad", "spanish2", "ai_ci", 2420},
{"la", "roman", "ai_ci", 2428},
{"fa", NullS, "ai_ci", 0}, // Disabled in MySQL
{"eo", "esperanto", "ai_ci", 2444},
{"hu", "hungarian", "ai_ci", 2452},
{"hr", "croatian", "ai_ci", 2500},
{"si", NullS, "ai_ci", 0}, // Disabled in MySQL
{"vi", "vietnamese", "ai_ci", 2492},
/* 278 Ascent sensitive, Case sensitive 'as_cs' */
{"","", "as_cs", 2311},
{"de_pb", "german2", "as_cs", 2471},
{"is", "icelandic", "as_cs", 2319},
{"lv", "latvian", "as_cs", 2327},
{"ro", "romanian", "as_cs", 2335},
{"sl", "slovenian", "as_cs", 2343},
{"pl", "polish", "as_cs", 2351},
{"et", "estonian", "as_cs", 2359},
{"es", "spanish", "as_cs", 2367},
{"sv", "swedish", "as_cs", 2375},
{"tr", "turkish", "as_cs", 2383},
{"cs", "czech", "as_cs", 2391},
{"da", "danish", "as_cs", 2399},
{"lt", "lithuanian", "as_cs", 2407},
{"sk", "slovak", "as_cs", 2415},
{"es_trad", "spanish2", "as_cs", 2423},
{"la", "roman", "as_cs", 2431},
{"fa", NullS, "as_cs", 0}, // Disabled in MySQL
{"eo", "esperanto", "as_cs", 2447},
{"hu", "hungarian", "as_cs", 2455},
{"hr", "croatian", "as_cs", 2503},
{"si", NullS, "as_cs", 0}, // Disabled in MySQL
{"vi", "vietnamese", "as_cs", 2495},
{"", NullS, "as_cs", 0}, // Missing
{"", NullS, "as_cs", 0}, // Missing
{"_ja_0900_as_cs", NullS, "as_cs", 0}, // Not supported
{"_ja_0900_as_cs_ks", NullS, "as_cs", 0}, // Not supported
/* 305 Ascent-sensitive, Case insensitive 'as_ci' */
{"","", "as_ci", 2310},
{"ru", NullS, "ai_ci", 0}, // Not supported
{"ru", NullS, "as_cs", 0}, // Not supported
{"zh", NullS, "as_cs", 0}, // Not supported
{NullS, NullS, "", 0}
};
static LEX_CSTRING
my_uca0900_collation_build_name(char *buffer, size_t buffer_size,
const char *cs_name,
const char *tailoring_name,
const char *sensitivity_suffix)
{
LEX_CSTRING res;
DBUG_ASSERT(buffer_size > 1);
res.str= buffer;
res.length= (strxnmov(buffer, buffer_size - 1,
cs_name, "_", tailoring_name,
(tailoring_name[0] ? "_" : ""),
"0900_",
sensitivity_suffix,
NullS) - buffer);
return res;
}
static LEX_CSTRING
my_ci_make_comment_for_alias(char *buffer, size_t buffer_size,
const char *srcname)
{
LEX_CSTRING res= {buffer, 0};
DBUG_ASSERT(buffer_size > 0);
res.length= strxnmov(buffer, buffer_size - 1, "Alias for ", srcname, NullS) -
buffer;
return res;
}
/*
Add a MySQL UCA-0900 collation as an alias for a MariaDB UCA-1400 collation.
*/
static my_bool
mysql_uca0900_collation_definition_add(MY_CHARSET_LOADER *loader,
const struct
mysql_0900_to_mariadb_1400_mapping *map,
uint alias_id)
{
char comment_buffer[MY_CS_COLLATION_NAME_SIZE + 15];
char alias_buffer[MY_CS_COLLATION_NAME_SIZE + 1];
char name1400_buffer[MY_CS_COLLATION_NAME_SIZE + 1];
LEX_CSTRING comment= {comment_buffer, 0};
LEX_CSTRING alias_name= {alias_buffer, 0};
LEX_CSTRING name1400= {name1400_buffer, 0};
LEX_CSTRING utf8mb4= {STRING_WITH_LEN("utf8mb4")};
uint id1400= map->collation_id;
uca_collation_def_param_t param= my_uca1400_collation_param_by_id(id1400);
const MY_UCA1400_COLLATION_DEFINITION *def1400=
&my_uca1400_collation_definitions[param.tailoring_id];
DBUG_ASSERT(my_collation_id_is_mysql_uca0900(alias_id));
alias_name= my_uca0900_collation_build_name(alias_buffer,
sizeof(alias_buffer),
"utf8mb4",
map->mysql_col_name,
map->case_sensitivity);
name1400= my_uca1400_collation_build_name(name1400_buffer,
sizeof(name1400_buffer),
&utf8mb4, def1400->name, &param);
comment= my_ci_make_comment_for_alias(comment_buffer, sizeof(comment_buffer),
name1400.str);
#ifdef DEBUG_PRINT_ALIAS
fprintf(stderr, "alias[%u] %-26s -> [%u] %s\n",
id, alias_name.str, id1400, name1400.str);
#endif
return my_uca1400_collation_alloc_and_init(loader, alias_name,
comment, &param, alias_id);
}
/*
Add support for MySQL 8.0 utf8mb4_0900_.. UCA collations.
The collation id's were collected from fprintf()
in mysql_uca0900_collation_definition_add().
Map mysql character sets to MariaDB using the same definition but
with the MySQL collation name and id.
*/
my_bool
mysql_uca0900_utf8mb4_collation_definitions_add(MY_CHARSET_LOADER *loader)
{
uint alias_id= mysql_0900_collation_start;
struct mysql_0900_to_mariadb_1400_mapping *map;
for (map= mysql_0900_mapping; map->mysql_col_name ; map++, alias_id++)
{
if (map->mariadb_col_name) /* Supported collation */
{
if (mysql_uca0900_collation_definition_add(loader, map, alias_id))
return TRUE;
}
}
return FALSE;
}
/*
Add MySQL utf8mb4_0900_bin collation as
an alias for MariaDB utf8mb4_nopad_bin.
*/
my_bool mysql_utf8mb4_0900_bin_add(MY_CHARSET_LOADER *loader)
{
CHARSET_INFO *src= &my_charset_utf8mb4_nopad_bin;
LEX_CSTRING alias_name= {STRING_WITH_LEN("utf8mb4_0900_bin")};
uint alias_id= 309;
char comment_buffer[MY_CS_COLLATION_NAME_SIZE+15];
LEX_CSTRING comment= my_ci_make_comment_for_alias(comment_buffer,
sizeof(comment_buffer),
src->coll_name.str);
struct charset_info_st *dst= my_ci_alloc(loader, alias_name, &alias_name,
comment, &comment);
if (!dst)
return TRUE;
*dst= *src;
dst->number= alias_id;
dst->coll_name= alias_name;
dst->comment= comment.str;
(loader->add_collation)(dst);
return FALSE;
}

47
strings/ctype-uca0900.h Normal file
View File

@@ -0,0 +1,47 @@
#ifndef CTYPE_UCA_0900_H
#define CTYPE_UCA_0900_H
/* Copyright (c) 2025, MariaDB Corporation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; version 2
of the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1335 USA */
#define mysql_0900_collation_start 255
#define mysql_0900_collation_end 308
#define mysql_0900_collation_num \
(mysql_0900_collation_end - mysql_0900_collation_start + 1 + 1/*End marker*/)
struct mysql_0900_to_mariadb_1400_mapping
{
const char *mysql_col_name, *mariadb_col_name, *case_sensitivity;
uint collation_id;
};
extern struct mysql_0900_to_mariadb_1400_mapping
mysql_0900_mapping[mysql_0900_collation_num];
static inline
my_bool my_collation_id_is_mysql_uca0900(uint id)
{
return id >= mysql_0900_collation_start &&
id <= mysql_0900_collation_end;
}
my_bool mysql_uca0900_utf8mb4_collation_definitions_add(MY_CHARSET_LOADER *ld);
my_bool mysql_utf8mb4_0900_bin_add(MY_CHARSET_LOADER *loader);
#endif /* CTYPE_UCA_0900_H */

363
strings/ctype-uca1400.c Normal file
View File

@@ -0,0 +1,363 @@
/* Copyright (c) 2025, MariaDB Corporation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; version 2
of the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1335 USA */
#include "strings_def.h"
#include "m_ctype.h"
#include "ctype-uca.h"
#include "ctype-uca0520.h"
#include "ctype-unidata.h"
#include "ctype-uca1400data.h"
/*
Return UCA-4.0.0 compatible ID (known since MySQL-4.1),
e.g. for use in the protocol with the old clients.
*/
uint my_uca1400_collation_id_uca400_compat(uint id)
{
uint tlid= my_uca1400_collation_id_to_tailoring_id(id);
my_cs_encoding_t csid= my_uca1400_collation_id_to_charset_id(id);
const MY_UCA1400_COLLATION_DEFINITION *def;
DBUG_ASSERT(my_collation_id_is_uca1400(id));
if (!(def= &my_uca1400_collation_definitions[tlid])->name)
return id;
switch (csid) {
case MY_CS_ENCODING_UTF8MB3: return def->id_utf8mb3;
case MY_CS_ENCODING_UTF8MB4: return def->id_utf8mb4;
case MY_CS_ENCODING_UCS2: return def->id_ucs2;
case MY_CS_ENCODING_UTF16: return def->id_utf16;
case MY_CS_ENCODING_UTF32: return def->id_utf32;
}
return id;
}
/*
Get a short (without the character set prefix) collation name
of a UCA-14.0.0 collation, e.g.
utf8mb4_uca1400_swedish_ai_ci -> uca1400_swedish_ai_ci
*/
LEX_CSTRING my_ci_get_collation_name_uca1400_context(CHARSET_INFO *cs)
{
LEX_CSTRING res;
DBUG_ASSERT(my_collation_id_is_uca1400(cs->number));
if (cs->coll_name.length <= cs->cs_name.length ||
cs->coll_name.str[cs->cs_name.length] != '_')
{
DBUG_ASSERT(0);
return cs->coll_name; /* Something went wrong, return the full name. */
}
res.str= cs->coll_name.str + cs->cs_name.length + 1;
res.length= cs->coll_name.length - cs->cs_name.length - 1;
return res;
}
/*
A preliminary initialized data for a UCA-14.0.0 collation.
The goal is to have the "logical position" members initialized (see below).
Weight tables are initialized later, at create_tailoring() time.
*/
MY_UCA_INFO my_uca_v1400=
{
{
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length,
(uint16 **) uca1400_weight,
{ /* Contractions: */
array_elements(uca1400_contractions), /* nitems */
uca1400_contractions, /* item */
NULL /* flags */
},
0, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
},
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length_secondary,
(uint16 **) uca1400_weight_secondary,
{ /* Contractions: */
array_elements(uca1400_contractions_secondary), /* nitems */
uca1400_contractions_secondary, /* item */
NULL /* flags */
},
1, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
},
{
0x10FFFF, /* maxchar */
(uchar *) uca1400_length_tertiary,
(uint16 **) uca1400_weight_tertiary,
{ /* Contractions: */
array_elements(uca1400_contractions_tertiary), /* nitems */
uca1400_contractions_tertiary, /* item */
NULL /* flags */
},
2, /* levelno */
{0}, /* contraction_hash */
NULL /* booster */
}
},
/* Logical positions */
uca1400_non_ignorable_first,
uca1400_non_ignorable_last,
uca1400_primary_ignorable_first,
uca1400_primary_ignorable_last,
uca1400_secondary_ignorable_first,
uca1400_secondary_ignorable_last,
uca1400_tertiary_ignorable_first,
uca1400_tertiary_ignorable_last,
0x0000, /* first_trailing */
0x0000, /* last_trailing */
uca1400_variable_first,
uca1400_variable_last,
/* Misc */
uca1400_version
};
/*
An array of MY_UCA_INFO (sorting tables).
Collations having the same character set and tailoring
(but different pad and accent/case sensitivity flags)
share the same array element. Also, aliases for MySQL-8.0
UCA-9.0.0 collations share the same array element with the
corresponding UCA-14.0.0 MariaDB collations.
For example, all these collation share one element of the array:
- utf8mb4_uca1400_swedish_ai_ci
- utf8mb4_uca1400_swedish_ai_cs
- utf8mb4_uca1400_swedish_as_ci
- utf8mb4_uca1400_swedish_as_cs
- utf8mb4_uca1400_swedish_nopad_ai_ci
- utf8mb4_uca1400_swedish_nopad_ai_cs
- utf8mb4_uca1400_swedish_nopad_as_ci
- utf8mb4_uca1400_swedish_nopad_as_cs
- utf8mb4_sv_0900_ai_ci
- utf8mb4_sv_0900_as_cs
*/
MY_UCA_INFO
my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1]
[MY_UCA1400_COLLATION_DEFINITION_COUNT];
/*
Make an UCA-14.0.0 collation ID using its properties.
*/
uint my_uca1400_make_builtin_collation_id(my_cs_encoding_t charset_id,
uint tailoring_id,
my_bool nopad,
my_bool secondary_level,
my_bool tertiary_level)
{
if (!my_uca1400_collation_definitions[tailoring_id].tailoring)
return 0;
return MY_UCA1400_COLLATION_ID_POSSIBLE_MIN +
(charset_id << 8) +
(tailoring_id << 3) +
(nopad << 2) +
(secondary_level << 1) +
(tertiary_level << 0);
}
/*
Make an UCA-14.0.0 full collation name as a concatenation of its
- Character set name
- UCA version
- Language rules (tailoring)
- pad characteristics
- accent sensitivity
- case sensitivity
e.g.: "utf8mb4" + "_uca1400" + "_swedish" + "_as" + "_ci"
*/
LEX_CSTRING
my_uca1400_collation_build_name(char *buffer, size_t buffer_size,
const LEX_CSTRING *cs_name,
const char *tailoring_name,
const uca_collation_def_param_t *prm)
{
LEX_CSTRING res;
res.str= buffer;
res.length=
my_snprintf(buffer, buffer_size, "%.*s_uca1400%s%s%s%s%s",
(int) cs_name->length, cs_name->str,
tailoring_name[0] ? "_" : "",
tailoring_name,
prm->nopad_flags ? "_nopad" : "",
prm->level_flags & (1<<MY_CS_LEVEL_BIT_SECONDARY) ? "_as" : "_ai",
prm->level_flags & (1<<MY_CS_LEVEL_BIT_TERTIARY) ? "_cs" : "_ci");
return res;
}
/*
For extra safety let's define and check a set of flags
which are not expected for UCA 1400 collations.
*/
static inline uint
uca1400_unexpected_flags()
{
return MY_CS_BINSORT|
MY_CS_PRIMARY|
MY_CS_PUREASCII|
MY_CS_LOWER_SORT;
}
/*
Perform a preliminary initialization of a charset_info_st instance.
It's enough for SHOW and INFORMATION_SCHEMA queries.
Deep initialization will be done later, when the collation is
used for the first time. See create_tailoring().
*/
static void
my_uca1400_collation_definition_init(MY_CHARSET_LOADER *loader,
struct charset_info_st *dst,
const uca_collation_def_param_t *param)
{
const MY_UCA1400_COLLATION_DEFINITION *def=
&my_uca1400_collation_definitions[param->tailoring_id];
/* Copy the entire charset_info_st from an in-compiled one. */
*dst= *my_uca0520_builtin_collation_by_id(param->cs_id, param->nopad_flags);
/* Now replace some members according to param */
DBUG_ASSERT((dst->state & uca1400_unexpected_flags()) == 0);
dst->uca= &my_uca_v1400;
dst->tailoring= def->tailoring;
if (def->tailoring == my_charset_utf8mb4_turkish_uca_ci.tailoring)
dst->casefold= &my_casefold_unicode1400tr;
else
dst->casefold= &my_casefold_unicode1400;
dst->state|= param->nopad_flags;
my_ci_set_level_flags(dst, param->level_flags);
}
/*
Allocate memory for a new charset_info_st instance together
with its name and comment.
Perform preliminary initialization, then add to the list
of available collations using MY_CHARSET_LOADER::add_collation.
*/
my_bool
my_uca1400_collation_alloc_and_init(MY_CHARSET_LOADER *loader,
LEX_CSTRING name,
LEX_CSTRING comment,
const uca_collation_def_param_t *param,
uint id)
{
struct charset_info_st *dst;
if (!(dst= my_ci_alloc(loader, name, &name, comment, &comment)))
return TRUE;
my_uca1400_collation_definition_init(loader, dst, param);
dst->number= id;
dst->coll_name= name;
dst->comment= comment.str;
return (loader->add_collation)(dst) != 0;
}
/*
Make an UCA-14.0.0 full collation name using its id,
then allocate and add the collation.
*/
static
my_bool my_uca1400_collation_definition_add(MY_CHARSET_LOADER *loader, uint id)
{
char coll_name_buffer[MY_CS_COLLATION_NAME_SIZE + 1];
LEX_CSTRING coll_name;
LEX_CSTRING comment= {"",0};
uca_collation_def_param_t param= my_uca1400_collation_param_by_id(id);
CHARSET_INFO *src= my_uca0520_builtin_collation_by_id(param.cs_id,
param.nopad_flags);
const MY_UCA1400_COLLATION_DEFINITION *def=
&my_uca1400_collation_definitions[param.tailoring_id];
coll_name= my_uca1400_collation_build_name(coll_name_buffer,
sizeof(coll_name_buffer),
&src->cs_name,
def->name,
&param);
return my_uca1400_collation_alloc_and_init(loader, coll_name, comment,
&param, id);
}
/*
Add UCA-14.0.0 collations for all combinations of:
- Unicode character sets (utf8mb3, utf8mb4, ucs2, utf16, utf32)
- language rules (tailorings)
- pad properties
- accent sensitivity
- case sensitivity
*/
my_bool my_uca1400_collation_definitions_add(MY_CHARSET_LOADER *loader)
{
my_cs_encoding_t charset_id;
for (charset_id= (my_cs_encoding_t) 0;
charset_id <= (my_cs_encoding_t) MY_CS_ENCODING_LAST;
charset_id++)
{
uint tailoring_id;
for (tailoring_id= 0 ;
tailoring_id < MY_UCA1400_COLLATION_DEFINITION_COUNT;
tailoring_id++)
{
my_bool nopad; /* PAD / NOPAD */
for (nopad= 0; nopad < 2; nopad++)
{
my_bool secondary_level; /* ai / as */
for (secondary_level= 0; secondary_level < 2; secondary_level++)
{
my_bool tertiary_level; /* ci / cs */
for (tertiary_level= 0; tertiary_level < 2; tertiary_level++)
{
uint id= my_uca1400_make_builtin_collation_id(charset_id,
tailoring_id,
nopad,
secondary_level,
tertiary_level);
if (id && my_uca1400_collation_definition_add(loader, id))
return TRUE;
}
}
}
}
}
return FALSE;
}

79
strings/ctype-uca1400.h
View File

@@ -187,6 +187,19 @@ my_collation_id_is_uca1400(uint id)
id <= MY_UCA1400_COLLATION_ID_POSSIBLE_MAX);
}
typedef struct my_uca1400_collation_definition_st
{
const char * tailoring;
const char * name;
uint16 id_utf8mb3;
uint16 id_utf8mb4;
uint16 id_ucs2;
uint16 id_utf16;
uint16 id_utf32;
} MY_UCA1400_COLLATION_DEFINITION;
/*
UCA1400 collation ID:
@@ -204,6 +217,7 @@ my_collation_id_is_uca1400(uint id)
static inline my_cs_encoding_t
my_uca1400_collation_id_to_charset_id(uint id)
{
DBUG_ASSERT(id);
return (my_cs_encoding_t) ((id >> 8) & 0x07);
}
@@ -211,6 +225,7 @@ my_uca1400_collation_id_to_charset_id(uint id)
static inline uint
my_uca1400_collation_id_to_tailoring_id(uint id)
{
DBUG_ASSERT(id);
return (id >> 3) & 0x1F;
}
@@ -218,21 +233,52 @@ my_uca1400_collation_id_to_tailoring_id(uint id)
static inline my_bool
my_uca1400_collation_id_to_nopad_flag(uint id)
{
DBUG_ASSERT(id);
return (my_bool) ((id >> 2) & 0x01);
}
static inline my_bool
my_uca1400_collation_id_to_secondary_level_flag(uint id)
{
DBUG_ASSERT(id);
return (my_bool) ((id >> 1) & 0x01);
}
static inline my_bool
my_uca1400_collation_id_to_tertiary_level_flag(uint id)
{
DBUG_ASSERT(id);
return (my_bool) ((id >> 0) & 0x01);
}
static inline uint
my_uca1400_collation_id_to_level_flags(uint id)
{
my_bool secondary_level, tertiary_level;
DBUG_ASSERT(id);
secondary_level= my_uca1400_collation_id_to_secondary_level_flag(id);
tertiary_level= my_uca1400_collation_id_to_tertiary_level_flag(id);
return (1 << MY_CS_LEVEL_BIT_PRIMARY) |
(secondary_level ? 1 << MY_CS_LEVEL_BIT_SECONDARY : 0) |
(tertiary_level ? 1 << MY_CS_LEVEL_BIT_TERTIARY : 0);
}
/*
Return an UCA-14.0.0 collation properties using its ID.
*/
static inline uca_collation_def_param_t
my_uca1400_collation_param_by_id(uint id)
{
uca_collation_def_param_t res;
DBUG_ASSERT(id);
res.cs_id= my_uca1400_collation_id_to_charset_id(id);
res.tailoring_id= my_uca1400_collation_id_to_tailoring_id(id);
res.nopad_flags= my_uca1400_collation_id_to_nopad_flag(id);
res.level_flags= my_uca1400_collation_id_to_level_flags(id);
return res;
}
uint
my_uca1400_make_builtin_collation_id(my_cs_encoding_t charset_id,
@@ -241,13 +287,36 @@ my_uca1400_make_builtin_collation_id(my_cs_encoding_t charset_id,
my_bool secondary_level,
my_bool tertiary_level);
my_bool
my_uca1400_collation_definition_init(MY_CHARSET_LOADER *loader,
struct charset_info_st *dst,
uint collation_id);
LEX_CSTRING
my_uca1400_collation_build_name(char *buffer, size_t buffer_size,
const LEX_CSTRING *cs_name,
const char *tailoring_name,
const uca_collation_def_param_t *prm);
my_bool
my_uca1400_collation_alloc_and_init(MY_CHARSET_LOADER *loader,
LEX_CSTRING name,
LEX_CSTRING comment,
const uca_collation_def_param_t *param,
uint id);
LEX_CSTRING my_ci_get_collation_name_uca1400_context(CHARSET_INFO *cs);
uint my_uca1400_collation_id_uca400_compat(uint id);
my_bool my_uca1400_collation_definitions_add(MY_CHARSET_LOADER *loader);
/* Exported data */
#define MY_UCA1400_COLLATION_DEFINITION_COUNT 26
my_bool mysql_utf8mb4_0900_collation_definitions_add();
extern MY_UCA1400_COLLATION_DEFINITION
my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT];
extern MY_UCA_INFO my_uca_v1400;
extern MY_UCA_INFO my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1]
[MY_UCA1400_COLLATION_DEFINITION_COUNT];
#endif /* CTYPE_UCA_1400_H */

51
strings/ctype-ucs2.c
View File

@@ -1513,7 +1513,8 @@ static MY_COLLATION_HANDLER my_collation_utf16_general_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1533,7 +1534,8 @@ static MY_COLLATION_HANDLER my_collation_utf16_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1553,7 +1555,8 @@ static MY_COLLATION_HANDLER my_collation_utf16_general_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1573,7 +1576,8 @@ static MY_COLLATION_HANDLER my_collation_utf16_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1860,7 +1864,8 @@ static MY_COLLATION_HANDLER my_collation_utf16le_general_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1880,7 +1885,8 @@ static MY_COLLATION_HANDLER my_collation_utf16le_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1900,7 +1906,8 @@ static MY_COLLATION_HANDLER my_collation_utf16le_general_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1920,7 +1927,8 @@ static MY_COLLATION_HANDLER my_collation_utf16le_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -2636,7 +2644,8 @@ static MY_COLLATION_HANDLER my_collation_utf32_general_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -2656,7 +2665,8 @@ static MY_COLLATION_HANDLER my_collation_utf32_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -2676,7 +2686,8 @@ static MY_COLLATION_HANDLER my_collation_utf32_general_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -2696,7 +2707,8 @@ static MY_COLLATION_HANDLER my_collation_utf32_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3207,7 +3219,8 @@ static MY_COLLATION_HANDLER my_collation_ucs2_general_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3227,7 +3240,8 @@ static MY_COLLATION_HANDLER my_collation_ucs2_general_mysql500_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3247,7 +3261,8 @@ static MY_COLLATION_HANDLER my_collation_ucs2_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3267,7 +3282,8 @@ static MY_COLLATION_HANDLER my_collation_ucs2_general_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3287,7 +3303,8 @@ static MY_COLLATION_HANDLER my_collation_ucs2_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

12
strings/ctype-ujis.c
View File

@@ -67260,7 +67260,8 @@ static MY_COLLATION_HANDLER my_collation_ujis_japanese_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67280,7 +67281,8 @@ static MY_COLLATION_HANDLER my_collation_ujis_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67300,7 +67302,8 @@ static MY_COLLATION_HANDLER my_collation_ujis_japanese_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -67320,7 +67323,8 @@ static MY_COLLATION_HANDLER my_collation_ujis_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

52
strings/ctype-utf8.c
View File

@@ -870,7 +870,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general1400_as_ci_handler=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -922,7 +923,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -942,7 +944,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_mysql500_ci_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -962,7 +965,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -982,7 +986,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_nopad_ci_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1002,7 +1007,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -1356,7 +1362,8 @@ static MY_COLLATION_HANDLER my_collation_cs_handler =
my_hash_sort_utf8mb3,
my_propagate_simple,
my_min_str_mb_simple,
my_max_str_mb_simple
my_max_str_mb_simple,
my_ci_eq_collation_generic
};
struct charset_info_st my_charset_utf8mb3_general_cs=
@@ -2674,7 +2681,8 @@ static MY_COLLATION_HANDLER my_collation_filename_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
static MY_CHARSET_HANDLER my_charset_filename_handler=
@@ -3031,6 +3039,19 @@ my_charlen_utf8mb4(CHARSET_INFO *cs __attribute__((unused)),
}
static my_bool
my_ci_eq_collation_utf8mb4_bin(CHARSET_INFO *a, CHARSET_INFO *b)
{
return a->cset == b->cset &&
a->coll == b->coll &&
a->uca == b->uca && a->uca == NULL &&
a->casefold == b->casefold &&
(a->state & MY_CS_NOPAD) == (b->state & MY_CS_NOPAD) &&
a->levels_for_order == b->levels_for_order &&
a->tailoring == b->tailoring && a->tailoring == NULL;
}
#define MY_FUNCTION_NAME(x) my_ ## x ## _utf8mb4
#define CHARLEN(cs,str,end) my_charlen_utf8mb4(cs,str,end)
#define DEFINE_WELL_FORMED_CHAR_LENGTH_USING_CHARLEN
@@ -3112,7 +3133,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_general_ci_handler=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3132,7 +3154,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_bin_handler =
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_utf8mb4_bin
};
@@ -3152,7 +3175,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_general_nopad_ci_handler=
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};
@@ -3172,7 +3196,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_nopad_bin_handler =
my_min_str_mb_simple_nopad,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_utf8mb4_bin
};
@@ -3271,7 +3296,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_general1400_as_ci_handler=
my_min_str_mb_simple,
my_max_str_mb_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

3
strings/ctype-win1250ch.c
View File

@@ -699,7 +699,8 @@ static MY_COLLATION_HANDLER my_collation_czech_cs_handler =
my_min_str_8bit_simple,
my_max_str_8bit_simple,
my_ci_get_id_generic,
my_ci_get_collation_name_generic
my_ci_get_collation_name_generic,
my_ci_eq_collation_generic
};

38
strings/ctype.c
View File

@@ -1413,3 +1413,41 @@ uint my_casefold_multiply_2(CHARSET_INFO *cs)
{
return 2;
}
my_bool my_ci_eq_collation_generic(CHARSET_INFO *self, CHARSET_INFO *other)
{
return FALSE;
}
/*
Allocate a memory block for a new charset_info_st together with
its name and its comment in a single once_alloc() call.
Copy the name and the comment into the new block.
*/
struct charset_info_st *my_ci_alloc(MY_CHARSET_LOADER *loader,
const LEX_CSTRING name,
LEX_CSTRING *out_name,
const LEX_CSTRING comment,
LEX_CSTRING *out_comment)
{
size_t nbytes= sizeof(struct charset_info_st) +
name.length + comment.length + 2;
struct charset_info_st *csinfo;
char *dst;
if (!(csinfo= (struct charset_info_st*) (loader->once_alloc)(nbytes)))
return NULL;
dst= ((char*) csinfo) + sizeof(struct charset_info_st);
memcpy(dst, name.str, name.length + 1);
out_name->str= dst;
out_name->length= name.length;
dst+= name.length + 1;
memcpy(dst, comment.str, comment.length + 1);
out_comment->str= dst;
out_comment->length= comment.length;
return csinfo;
}

10
strings/json_lib.c
View File

@@ -1656,15 +1656,7 @@ int json_unescape(CHARSET_INFO *json_cs,
}
if (c_len == MY_CS_ILUNI)
{
/*
Result charset doesn't support the json's character.
Let's replace it with the '?' symbol.
*/
if ((c_len= my_ci_wc_mb(res_cs, '?', res, res_end)) > 0)
{
res+= c_len;
continue;
}
return -1;
}
/* Result buffer is too small. */
return -1;

7
strings/strings_def.h
View File

@@ -225,6 +225,13 @@ void my_ci_set_level_flags(struct charset_info_st *cs, uint flags);
uint my_casefold_multiply_1(CHARSET_INFO *cs);
uint my_casefold_multiply_2(CHARSET_INFO *cs);
my_bool my_ci_eq_collation_generic(CHARSET_INFO *self, CHARSET_INFO *other);
struct charset_info_st *my_ci_alloc(MY_CHARSET_LOADER *loader,
const LEX_CSTRING name,
LEX_CSTRING *out_name,
const LEX_CSTRING comment,
LEX_CSTRING *out_comment);
/* Some common character set names */
extern const char charset_name_latin2[];