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

Merging the changes for build failures in windows.

Browse source
This commit is contained in:
Murthy Narkedimilli 2013-05-13 15:22:49 +02:00
parent 500f76f4f3
commit 2e60b30cfb
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 */