database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-20 13:17:02 +03:00
parent fed0d85de7 0c0a569028
commit 0792aff161
40 changed files with 941 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.h
View File

@ -193,6 +193,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;
}
};