mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from mysql-5.1 to mysql-5.5

Browse source
This commit is contained in:
Annamalai Gurusami 2013-05-12 19:45:42 +05:30
commit 0b40def788
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
storage/innobase/handler/ha_innodb.cc
View file

@ -11978,7 +11978,6 @@ test_innobase_convert_name()
}
}
}
#endif /* UNIV_COMPILE_TEST_FUNCS */
/**********************************************************************
@ -11992,17 +11991,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));
}