1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing a build issue. In InnoDB plugin, the function

Browse Source 
innobase_convert_to_filename_charset() was by mistake kept within
the conditional compilation of UNIV_COMPILE_TEST_FUNCS.  Now placing
the function out of UNIV_COMPILE_TEST_FUNCS.  Also, removed the
unnecessary log message (as in 5.6+).
This commit is contained in:
Annamalai Gurusami 2013-05-12 19:41:25 +05:30
parent 07ef11b2cc
commit 87a1918fe6
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
storage/innodb_plugin/handler/ha_innodb.cc
View File

@ -11624,6 +11624,7 @@ test_innobase_convert_name()
}
}
}
#endif /* UNIV_COMPILE_TEST_FUNCS */
/**********************************************************************
Converts an identifier from my_charset_filename to UTF-8 charset. */
@ -11636,19 +11637,8 @@ innobase_convert_to_filename_charset(
ulint len) /* in: length of 'to', in bytes */
{
uint errors;
uint rlen;
CHARSET_INFO* cs_to = &my_charset_filename;
CHARSET_INFO* cs_from = system_charset_info;
rlen = strconvert(cs_from, from, cs_to, to, len, &errors);
if (errors) {
fprintf(stderr, "InnoDB: There was a problem in converting"
"'%s' in charset %s to charset %s", from, cs_from->name,
cs_to->name);
}
return(rlen);
return(strconvert(cs_from, from, cs_to, to, len, &errors));
}
#endif /* UNIV_COMPILE_TEST_FUNCS */