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:
Aleksey Midenkov
2019-11-25 17:24:09 +03:00
parent 7c7f9bef28 f9ceb0a67f
commit 0c05a2ed71
44 changed files with 722 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_string.h
View File

@ -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",