From d6cc61ec3d7a32a1ce5b2a94fc609191f576185e Mon Sep 17 00:00:00 2001 From: Annamalai Gurusami Date: Sun, 12 May 2013 19:41:25 +0530 Subject: [PATCH] Fixing a build issue. In InnoDB plugin, the function 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+). --- storage/innodb_plugin/handler/ha_innodb.cc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc index 38f1fd566b1..792717d471d 100644 --- a/storage/innodb_plugin/handler/ha_innodb.cc +++ b/storage/innodb_plugin/handler/ha_innodb.cc @@ -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 */