mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/10.3' into 10.4

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2021-09-09 09:18:12 +03:00
commit de7e027d5e
170 changed files with 4133 additions and 2398 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/handler/ha_innodb.cc
View file

@ -6637,7 +6637,8 @@ wsrep_innobase_mysql_sort(
// Note that strnxfrm may change length of string
tmp_length= charset->coll->strnxfrmlen(charset, str_length);
tmp_length= ut_max(str_length, tmp_length) + 1;
tmp_length= tmp_length * charset->mbmaxlen;
tmp_length= ut_max(str_length, tmp_length) + charset->mbmaxlen;
tmp_str= static_cast<uchar *>(ut_malloc_nokey(tmp_length));
ut_ad(str_length <= tmp_length);
memcpy(tmp_str, str, str_length);