database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-12-23 14:52:59 +02:00
parent 04741dc736 fa1aef39eb
commit 0aa02567dd
36 changed files with 593 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_type.cc
View File

@ -8633,11 +8633,18 @@ LEX_CSTRING Charset::collation_specific_name() const
for character sets and collations, so a collation
name not necessarily starts with the character set name.
*/
LEX_CSTRING retval;
size_t csname_length= strlen(m_charset->csname);
if (strncmp(m_charset->name, m_charset->csname, csname_length))
return {NULL, 0};
{
retval.str= NULL;
retval.length= 0;
return retval;
}
const char *ptr= m_charset->name + csname_length;
return {ptr, strlen(ptr) };
retval.str= ptr;
retval.length= strlen(ptr);
return retval;
}