Commit b6ce493d authored by Varun Gupta's avatar Varun Gupta

Fixing compile failure on kvm full-text

parent e30a05f4
...@@ -5999,11 +5999,18 @@ LEX_CSTRING Charset::collation_specific_name() const ...@@ -5999,11 +5999,18 @@ LEX_CSTRING Charset::collation_specific_name() const
for character sets and collations, so a collation for character sets and collations, so a collation
name not necessarily starts with the character set name. name not necessarily starts with the character set name.
*/ */
LEX_CSTRING retval;
size_t csname_length= strlen(m_charset->csname); size_t csname_length= strlen(m_charset->csname);
if (strncmp(m_charset->name, m_charset->csname, csname_length)) 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; const char *ptr= m_charset->name + csname_length;
return {ptr, strlen(ptr) }; retval.str= ptr;
retval.length= strlen(ptr);
return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment