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 mariadb-10.4.14

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-10 20:37:52 +03:00
parent 2b9c53102c ddffcad64c
commit 101ddc5e27
182 changed files with 2839 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.h
View File

@ -918,6 +918,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);