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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-03 16:24:47 +02:00
parent 44836bcd12 533a13af06
commit 133b4b46fe
44 changed files with 1706 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/lex_string.h
View File

@ -76,12 +76,12 @@ static inline bool lex_string_cmp(CHARSET_INFO *charset, const LEX_CSTRING *a,
static inline bool cmp(const LEX_CSTRING *a, const LEX_CSTRING *b)
{
return (a->length != b->length ||
memcmp(a->str, b->str, a->length));
return a->length != b->length ||
(a->length && memcmp(a->str, b->str, a->length));
}
static inline bool cmp(const LEX_CSTRING a, const LEX_CSTRING b)
{
return a.length != b.length || memcmp(a.str, b.str, a.length);
return a.length != b.length || (a.length && memcmp(a.str, b.str, a.length));
}
/*