diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
| commit | 1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec (patch) | |
| tree | c1da70f7f990dae02c5dfe70fd75299ced68873c /sql/sql_string.h | |
| parent | 0fb84216a35046a4574dec214dcce03130a797c1 (diff) | |
| parent | b11ff3d49581d9e7b6f8b990f08e85e4d6384418 (diff) | |
| download | mariadb-git-1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec.tar.gz | |
Merge 10.2 into 10.3
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 f4764211522..614b54065fd 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, 2018, 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; } }; |