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 branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-03 14:44:06 +02:00
parent 706a7101bf c32f71af7e
commit 57325e4706
134 changed files with 2307 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.h
View File

@ -912,6 +912,10 @@ public:
// Append with optional character set conversion from cs to charset()
bool append(const char *s, size_t arg_length, CHARSET_INFO *cs);
bool append(const LEX_CSTRING &s, CHARSET_INFO *cs)
{
return append(s.str, s.length, cs);
}
void strip_sp();
friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);