diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
| commit | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (patch) | |
| tree | 5d05c0591e7deef310800a1952a067ad6ad74777 /mysys | |
| parent | a9eb272f9147b2889b95b3f53353e1c735defaba (diff) | |
| parent | cacea31687c098c0348deb1e433f4baddd817419 (diff) | |
| download | mariadb-git-c41c79650aa2ef8eaf3f887b94db8cc7478eadd1.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 32cfeb56e2d..5e58b10e0bd 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -381,6 +381,8 @@ static int add_collation(struct charset_info_st *cs) &my_charset_utf8mb4_unicode_ci, cs); newcs->m_ctype= my_charset_utf8mb4_unicode_ci.m_ctype; + if (init_state_maps(newcs)) + return MY_XML_ERROR; newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED; #endif } |