Fixing compile failure on kvm full-text

1 files changed, 9 insertions, 2 deletions

diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index 0bae1e55145..32862be371a 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -5999,11 +5999,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;
 }