diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
commit | 6aec87544c675751141100d6efe3a2d943cb528f (patch) | |
tree | 8771c79790e0b58df172e48214a5077899a9b312 /mysys | |
parent | 70a515df434a57709eaf69f451c22739d7908ba4 (diff) | |
parent | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (diff) | |
download | mariadb-git-6aec87544c675751141100d6efe3a2d943cb528f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/charset.c | 2 | ||||
-rw-r--r-- | mysys/my_largepage.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 19cad76fdf4..4c02ae5f1fb 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -393,6 +393,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 } diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index 0fdc4e17a26..c5fc2a1264e 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -354,7 +354,7 @@ uchar *my_large_malloc(size_t *size, myf my_flags) ptr= NULL; if (my_flags & MY_WME) { - if (large_page_size) + if (large_page_size && errno == ENOMEM) { my_printf_error(EE_OUTOFMEMORY, "Couldn't allocate %zu bytes (Large/HugeTLB memory " |