database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-13 18:36:09 +03:00
parent d46db415ce 8e3a4be45c
commit 984d7100cd
157 changed files with 3036 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_string.h
View File

@ -679,6 +679,7 @@ public:
int reserve(size_t space_needed)
{
DBUG_ASSERT((ulonglong) str_length + space_needed < UINT_MAX32);
return realloc(str_length + space_needed);
}
int reserve(size_t space_needed, size_t grow_by);
@ -964,6 +965,8 @@ public:
{
return !sortcmp(this, other, cs);
}
private:
bool append_semi_hex(const char *s, uint len, CHARSET_INFO *cs);
};