diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
| commit | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (patch) | |
| tree | 11747103367332f63928220376b5093b9e2ebdc5 /sql/sql_string.h | |
| parent | 2b9c53102c7c7428279c5fd02f771d335b5c53dc (diff) | |
| parent | ddffcad64c9ff3299037eed9df1bc92d51f8d07e (diff) | |
| download | mariadb-git-101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a.tar.gz | |
Merge mariadb-10.4.14
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 7d2ce5cecbc..85c3bbd6044 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -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); |