summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 12:38:25 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-20 12:38:25 +0300
commit0c0a56902898038726342ae11decf4bf5421d339 (patch)
treeed1f66692ac80cce3d168831a72f22100f5ee928 /sql/sql_string.h
parentef784c4ea2ce93bc8cdd953e84456e69f5875dda (diff)
parent5dcc56be4d9979e9be927b68f4e62df7a6c3d5a1 (diff)
downloadmariadb-git-0c0a56902898038726342ae11decf4bf5421d339.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 0098ad15cb6..ff29e98bfd9 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -180,6 +180,10 @@ public:
LEX_CSTRING collation_specific_name() const;
bool encoding_allows_reinterpret_as(CHARSET_INFO *cs) const;
bool eq_collation_specific_names(CHARSET_INFO *cs) const;
+ bool can_have_collate_clause() const
+ {
+ return m_charset != &my_charset_bin;
+ }
};