database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.6' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-04 08:01:06 +02:00
parent a89527e127 5ea5291d97
commit 34a8e78581
858 changed files with 12277 additions and 6177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
strings/ctype-bin.c
View File

@@ -86,7 +86,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);
}
@@ -147,7 +147,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);
}