diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
| commit | 43ee6915fa4b8e3088e89b7d4325946190ce04f5 (patch) | |
| tree | e580d22b0ff6faed1720f88ddeedf86a0867fa41 /sql/sql_string.h | |
| parent | 7d4beb7286d53be07ff552de9d37ea90c2762651 (diff) | |
| parent | 1ebe841fb85725c2a6aaecb3bca41ec098a5193d (diff) | |
| download | mariadb-git-43ee6915fa4b8e3088e89b7d4325946190ce04f5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index d110e10647a..23783405b19 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -437,6 +437,7 @@ public: bool copy(); // Alloc string if not alloced bool copy(const String &s); // Allocate new string bool copy(const char *s,size_t arg_length, CHARSET_INFO *cs); // Allocate new string + bool copy_or_move(const char *s,size_t arg_length, CHARSET_INFO *cs); static bool needs_conversion(size_t arg_length, CHARSET_INFO *cs_from, CHARSET_INFO *cs_to, uint32 *offset); |