diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 14:50:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 14:50:23 +0300 |
| commit | e2f1f88fa60680cb87833a7cceb172f5d436a804 (patch) | |
| tree | 5e48f8ed5c7a169af6692c72de9f1007af48737e /sql/sql_string.h | |
| parent | 9eae063e79376fd71586e1106e750a366467a984 (diff) | |
| parent | b092d35f13ceae37cda26478635b127f9b401e2c (diff) | |
| download | mariadb-git-e2f1f88fa60680cb87833a7cceb172f5d436a804.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index aad5314a973..7d7d9f08748 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -3,7 +3,7 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2008, 2019, MariaDB Corporation. + Copyright (c) 2008, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,6 +79,10 @@ public: Well_formed_prefix(CHARSET_INFO *cs, const char *str, size_t length) :Well_formed_prefix_status(cs, str, str + length, length), m_str(str) { } + Well_formed_prefix(CHARSET_INFO *cs, LEX_STRING str, size_t nchars) + :Well_formed_prefix_status(cs, str.str, str.str + str.length, nchars), + m_str(str.str) + { } size_t length() const { return m_source_end_pos - m_str; } }; |