diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2019-11-25 17:24:09 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2019-11-25 17:24:09 +0300 |
| commit | 0c05a2ed71ebf408e32f7fcdd358d756948d8a5d (patch) | |
| tree | fabe919df6b001b22391f37c7a32a1e34a6bfd79 /sql/sql_string.h | |
| parent | 7c7f9bef28aa566557da31402142f6dd8298ddd2 (diff) | |
| parent | f9ceb0a67ffb20631c936a7e8e8776c000d677ac (diff) | |
| download | mariadb-git-0c05a2ed71ebf408e32f7fcdd358d756948d8a5d.tar.gz | |
Merge 10.4 into 10.5
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 8ced35657e8..317adc13909 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, 2019, 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 @@ -169,6 +169,10 @@ public: { swap_variables(CHARSET_INFO*, m_charset, other.m_charset); } + bool same_encoding(const Charset &other) const + { + return !strcmp(m_charset->csname, other.m_charset->csname); + } /* Collation name without the character set name. For example, in case of "latin1_swedish_ci", |