Commit 07967e12 authored by Annamalai Gurusami's avatar Annamalai Gurusami

Merge from mysql-5.1 to mysql-5.5

parents 6968110f be4941a9
...@@ -11978,7 +11978,6 @@ test_innobase_convert_name() ...@@ -11978,7 +11978,6 @@ test_innobase_convert_name()
} }
} }
} }
#endif /* UNIV_COMPILE_TEST_FUNCS */ #endif /* UNIV_COMPILE_TEST_FUNCS */
/********************************************************************** /**********************************************************************
...@@ -11992,17 +11991,8 @@ innobase_convert_to_filename_charset( ...@@ -11992,17 +11991,8 @@ innobase_convert_to_filename_charset(
ulint len) /* in: length of 'to', in bytes */ ulint len) /* in: length of 'to', in bytes */
{ {
uint errors; uint errors;
uint rlen;
CHARSET_INFO* cs_to = &my_charset_filename; CHARSET_INFO* cs_to = &my_charset_filename;
CHARSET_INFO* cs_from = system_charset_info; CHARSET_INFO* cs_from = system_charset_info;
rlen = strconvert(cs_from, from, cs_to, to, len, &errors); return(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);
} }
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