diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 13:14:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-28 13:14:08 +0200 |
| commit | 7a834d6248f42bd2207152071d31e9ecfc5de422 (patch) | |
| tree | 583f7edea179b674adcebf7e5e507d9c1c733597 /mysys | |
| parent | 50c8e65b38b279496ca1f9a9f9029429d98e07e5 (diff) | |
| parent | 95d51369c9b1d5b759be630003ab12e9615ea0cc (diff) | |
| download | mariadb-git-7a834d6248f42bd2207152071d31e9ecfc5de422.tar.gz | |
Merge 10.11 into 11.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 9a049689dce..67abfe628a2 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -308,8 +308,6 @@ copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from, to->max_sort_char= from->max_sort_char; to->mbminlen= from->mbminlen; to->mbmaxlen= from->mbmaxlen; - to->caseup_multiply= from->caseup_multiply; - to->casedn_multiply= from->casedn_multiply; to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_STRNXFRM | MY_CS_UNICODE; } @@ -359,7 +357,6 @@ static int add_collation(struct charset_info_st *cs) if (cs_copy_data(newcs,cs)) return MY_XML_ERROR; - newcs->caseup_multiply= newcs->casedn_multiply= 1; newcs->levels_for_order= 1; if (!strcmp(cs->cs_name.str,"ucs2") ) |