MDEV-30695 Refactor case folding data types in Asian collations

This is a non-functional change and should not change the server behavior.

Casefolding information is now stored in items of a new data type MY_CASEFOLD_CHARACTER:

typedef struct casefold_info_char_t
{
  uint32 toupper;
  uint32 tolower;
} MY_CASEFOLD_CHARACTER;

Before this change, casefolding tables for Asian collations were stored in:

typedef struct unicase_info_char_st
{
  uint32 toupper;
  uint32 tolower;
  uint32 sort;
} MY_UNICASE_CHARACTER;

The "sort" member was not used in the code handling Asian collations,
it only wasted space.
(it's only used by Unicode _general_ci and _general_mysql500_ci collations).

Unicode collations (at least UCA and _bin) should also be refactored later,
but under terms of a separate task.
This commit is contained in:
Alexander Barkov 2023-02-21 12:38:50 +04:00
parent 7e341cc740
commit 33f8f92b74
20 changed files with 8185 additions and 7842 deletions

View file

@ -80,10 +80,26 @@ typedef const struct my_charset_handler_st MY_CHARSET_HANDLER;
typedef const struct my_collation_handler_st MY_COLLATION_HANDLER;
typedef const struct unicase_info_st MY_UNICASE_INFO;
typedef const struct casefold_info_st MY_CASEFOLD_INFO;
typedef const struct uni_ctype_st MY_UNI_CTYPE;
typedef const struct my_uni_idx_st MY_UNI_IDX;
typedef uint16 decimal_digits_t;
typedef struct casefold_info_char_t
{
uint32 toupper;
uint32 tolower;
} MY_CASEFOLD_CHARACTER;
struct casefold_info_st
{
my_wc_t maxchar;
MY_CASEFOLD_CHARACTER **page;
};
typedef struct unicase_info_char_st
{
uint32 toupper;
@ -755,6 +771,7 @@ struct charset_info_st
MY_UCA_INFO *uca;
const uint16 *tab_to_uni;
MY_UNI_IDX *tab_from_uni;
MY_CASEFOLD_INFO *casefold;
MY_UNICASE_INFO *caseinfo;
const uchar *state_map;
const uchar *ident_map;

View file

@ -408,6 +408,7 @@ void dispcset(FILE *f,CHARSET_INFO *cs)
}
fprintf(f," NULL, /* from_uni */\n");
fprintf(f," NULL, /* casefold */\n");
fprintf(f," &my_unicase_default, /* caseinfo */\n");
fprintf(f," NULL, /* state map */\n");
fprintf(f," NULL, /* ident map */\n");

File diff suppressed because it is too large Load diff

View file

@ -622,6 +622,7 @@ struct charset_info_st my_charset_bin =
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

File diff suppressed because it is too large Load diff

View file

@ -617,6 +617,7 @@ struct charset_info_st my_charset_latin2_czech_cs =
NULL, /* uca */
tab_8859_2_uni, /* tab_to_uni */
idx_uni_8859_2, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -3689,6 +3689,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_dec8_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3720,6 +3721,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp850_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3751,6 +3753,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin1_german1_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3782,6 +3785,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hp8_english_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3813,6 +3817,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8r_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3844,6 +3849,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3875,6 +3881,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_swe7_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3906,6 +3913,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_ascii_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3937,6 +3945,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3968,6 +3977,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin1_danish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -3999,6 +4009,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hebrew_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4030,6 +4041,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4061,6 +4073,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4092,6 +4105,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8u_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4123,6 +4137,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4154,6 +4169,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_greek_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4185,6 +4201,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4216,6 +4233,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4247,6 +4265,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1257_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4278,6 +4297,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin5_turkish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4309,6 +4329,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_armscii8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4340,6 +4361,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp866_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4371,6 +4393,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_keybcs2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4402,6 +4425,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macce_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4433,6 +4457,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macroman_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4464,6 +4489,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp852_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4495,6 +4521,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4526,6 +4553,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4557,6 +4585,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macce_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4588,6 +4617,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4619,6 +4649,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin1_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4650,6 +4681,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin1_general_cs, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4681,6 +4713,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4712,6 +4745,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4743,6 +4777,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4774,6 +4809,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macroman_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4805,6 +4841,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1256_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4836,6 +4873,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1257_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4867,6 +4905,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1257_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4898,6 +4937,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_armscii8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4929,6 +4969,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_ascii_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4960,6 +5001,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -4991,6 +5033,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1256_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5022,6 +5065,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp866_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5053,6 +5097,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_dec8_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5084,6 +5129,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_greek_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5115,6 +5161,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hebrew_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5146,6 +5193,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hp8_english_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5177,6 +5225,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_keybcs2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5208,6 +5257,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8r_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5239,6 +5289,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8u_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5270,6 +5321,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5301,6 +5353,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin5_turkish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5332,6 +5385,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5363,6 +5417,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp850_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5394,6 +5449,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp852_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5425,6 +5481,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_swe7_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5456,6 +5513,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_geostd8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5487,6 +5545,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_geostd8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5518,6 +5577,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin1_spanish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5549,6 +5609,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5580,6 +5641,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_dec8_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5611,6 +5673,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp850_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5642,6 +5705,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hp8_english_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5673,6 +5737,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8r_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5704,6 +5769,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5735,6 +5801,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_swe7_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5766,6 +5833,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_ascii_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5797,6 +5865,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hebrew_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5828,6 +5897,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8u_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5859,6 +5929,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_greek_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5890,6 +5961,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5921,6 +5993,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin5_turkish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5952,6 +6025,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_armscii8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -5983,6 +6057,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp866_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6014,6 +6089,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_keybcs2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6045,6 +6121,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macce_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6076,6 +6153,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macroman_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6107,6 +6185,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp852_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6138,6 +6217,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6169,6 +6249,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macce_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6200,6 +6281,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6231,6 +6313,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1251_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6262,6 +6345,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_macroman_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6293,6 +6377,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1256_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6324,6 +6409,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1257_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6355,6 +6441,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1257_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6386,6 +6473,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_armscii8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6417,6 +6505,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_ascii_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6448,6 +6537,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1250_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6479,6 +6569,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp1256_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6510,6 +6601,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp866_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6541,6 +6633,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_dec8_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6572,6 +6665,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_greek_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6603,6 +6697,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hebrew_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6634,6 +6729,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_hp8_english_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6665,6 +6761,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_keybcs2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6696,6 +6793,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8r_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6727,6 +6825,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_koi8u_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6758,6 +6857,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin2_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6789,6 +6889,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin5_turkish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6820,6 +6921,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_latin7_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6851,6 +6953,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp850_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6882,6 +6985,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_cp852_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6913,6 +7017,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_swe7_swedish_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6944,6 +7049,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_geostd8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -6975,6 +7081,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
to_uni_geostd8_general_ci, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */
@ -7005,6 +7112,7 @@ struct charset_info_st compiled_charsets[] = {
NULL, /* uca */
NULL, /* to_uni */
NULL, /* from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state map */
NULL, /* ident map */

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -448,6 +448,7 @@ struct charset_info_st my_charset_latin1=
NULL, /* uca */
cs_to_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -479,6 +480,7 @@ struct charset_info_st my_charset_latin1_nopad=
NULL, /* uca */
cs_to_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -760,6 +762,7 @@ struct charset_info_st my_charset_latin1_german2_ci=
NULL, /* uca */
cs_to_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -791,6 +794,7 @@ struct charset_info_st my_charset_latin1_bin=
NULL, /* uca */
cs_to_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -822,6 +826,7 @@ struct charset_info_st my_charset_latin1_nopad_bin=
NULL, /* uca */
cs_to_uni, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

View file

@ -63,11 +63,11 @@ size_t my_casedn_str_mb(CHARSET_INFO * cs, char *str)
}
static inline MY_UNICASE_CHARACTER*
static inline MY_CASEFOLD_CHARACTER*
get_case_info_for_ch(CHARSET_INFO *cs, uint page, uint offs)
{
MY_UNICASE_CHARACTER *p;
return cs->caseinfo && (p= cs->caseinfo->page[page]) ? &p[offs] : NULL;
MY_CASEFOLD_CHARACTER *p;
return cs->casefold && (p= cs->casefold->page[page]) ? &p[offs] : NULL;
}
@ -97,7 +97,7 @@ my_casefold_mb(CHARSET_INFO *cs,
size_t mblen= my_ismbchar(cs, src, srcend);
if (mblen)
{
MY_UNICASE_CHARACTER *ch;
MY_CASEFOLD_CHARACTER *ch;
if ((ch= get_case_info_for_ch(cs, (uchar) src[0], (uchar) src[1])))
{
int code= is_upper ? ch->toupper : ch->tolower;

File diff suppressed because it is too large Load diff

View file

@ -955,6 +955,7 @@ struct charset_info_st my_charset_tis620_thai_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -985,6 +986,7 @@ struct charset_info_st my_charset_tis620_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1016,6 +1018,7 @@ struct charset_info_st my_charset_tis620_thai_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1047,6 +1050,7 @@ struct charset_info_st my_charset_tis620_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

File diff suppressed because it is too large Load diff

View file

@ -1637,6 +1637,7 @@ struct charset_info_st my_charset_utf16_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1668,6 +1669,7 @@ struct charset_info_st my_charset_utf16_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1699,6 +1701,7 @@ struct charset_info_st my_charset_utf16_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1731,6 +1734,7 @@ struct charset_info_st my_charset_utf16_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -1992,6 +1996,7 @@ struct charset_info_st my_charset_utf16le_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2023,6 +2028,7 @@ struct charset_info_st my_charset_utf16le_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2054,6 +2060,7 @@ struct charset_info_st my_charset_utf16le_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2086,6 +2093,7 @@ struct charset_info_st my_charset_utf16le_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2832,6 +2840,7 @@ struct charset_info_st my_charset_utf32_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2863,6 +2872,7 @@ struct charset_info_st my_charset_utf32_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2894,6 +2904,7 @@ struct charset_info_st my_charset_utf32_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -2926,6 +2937,7 @@ struct charset_info_st my_charset_utf32_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -3437,6 +3449,7 @@ struct charset_info_st my_charset_ucs2_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -3468,6 +3481,7 @@ struct charset_info_st my_charset_ucs2_general_mysql500_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_mysql500, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -3499,6 +3513,7 @@ struct charset_info_st my_charset_ucs2_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -3530,6 +3545,7 @@ struct charset_info_st my_charset_ucs2_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -3561,6 +3577,7 @@ struct charset_info_st my_charset_ucs2_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

File diff suppressed because it is too large Load diff

View file

@ -5810,6 +5810,7 @@ struct charset_info_st my_charset_utf8mb3_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -5841,6 +5842,7 @@ struct charset_info_st my_charset_utf8mb3_general_mysql500_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_mysql500, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -5872,6 +5874,7 @@ struct charset_info_st my_charset_utf8mb3_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -5903,6 +5906,7 @@ struct charset_info_st my_charset_utf8mb3_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -5934,6 +5938,7 @@ struct charset_info_st my_charset_utf8mb3_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -6097,6 +6102,7 @@ struct charset_info_st my_charset_utf8mb3_general_cs=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -7455,6 +7461,7 @@ struct charset_info_st my_charset_filename=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -8168,6 +8175,7 @@ struct charset_info_st my_charset_utf8mb4_general_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -8200,6 +8208,7 @@ struct charset_info_st my_charset_utf8mb4_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -8232,6 +8241,7 @@ struct charset_info_st my_charset_utf8mb4_general_nopad_ci=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */
@ -8264,6 +8274,7 @@ struct charset_info_st my_charset_utf8mb4_nopad_bin=
NULL, /* uca */
NULL, /* tab_to_uni */
NULL, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default,/* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */

View file

@ -710,6 +710,7 @@ struct charset_info_st my_charset_cp1250_czech_cs =
NULL, /* uca */
tab_cp1250_uni, /* tab_to_uni */
idx_uni_cp1250, /* tab_from_uni */
NULL, /* casefold */
&my_unicase_default, /* caseinfo */
NULL, /* state_map */
NULL, /* ident_map */