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

Merge branch '10.4' into 10.5

Browse source
This commit is contained in:
Oleksandr Byelkin 2023-07-26 13:54:59 +02:00
commit 7564be1352
111 changed files with 3375 additions and 1511 deletions
Download patch file Download diff file Expand all files Collapse all files

4
strings/ctype-bin.c
View file

@ -84,7 +84,7 @@ static int my_strnncoll_binary(CHARSET_INFO * cs __attribute__((unused)),
my_bool t_is_prefix)
{
size_t len=MY_MIN(slen,tlen);
int cmp= memcmp(s,t,len);
int cmp= len ? memcmp(s, t, len) : 0;
return cmp ? cmp : (int)((t_is_prefix ? len : slen) - tlen);
}
@ -145,7 +145,7 @@ static int my_strnncoll_8bit_bin(CHARSET_INFO * cs __attribute__((unused)),
my_bool t_is_prefix)
{
size_t len=MY_MIN(slen,tlen);
int cmp= memcmp(s,t,len);
int cmp= len ? memcmp(s, t, len) : 0;
return cmp ? cmp : (int)((t_is_prefix ? len : slen) - tlen);
}