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

Auto merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius 2010-04-01 12:09:35 +03:00
commit 7feccbea9b
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_gethostbyname.c
View File

@ -95,7 +95,7 @@ struct hostent *
my_gethostbyname_r(const char *name, my_gethostbyname_r(const char *name,
struct hostent *result __attribute__((unused)), struct hostent *result __attribute__((unused)),
char *buffer __attribute__((unused)), char *buffer __attribute__((unused)),
int buflen__attribute__((unused)), int buflen __attribute__((unused)),
int *h_errnop) int *h_errnop)
{ {
struct hostent *hp; struct hostent *hp;

1
storage/xtradb/handler/i_s.cc
View File

@ -2988,7 +2988,6 @@ i_s_innodb_admin_command_fill(
COND* cond) COND* cond)
{ {
TABLE* i_s_table = (TABLE *) tables->table; TABLE* i_s_table = (TABLE *) tables->table;
CHARSET_INFO *cs= system_charset_info;
char** query_str; char** query_str;
char* ptr; char* ptr;
char quote = '\0'; char quote = '\0';

1
storage/xtradb/log/log0recv.c
View File

@ -3280,7 +3280,6 @@ recv_recovery_from_checkpoint_finish(void)
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
if (recv_needed_recovery && srv_recovery_stats) { if (recv_needed_recovery && srv_recovery_stats) {
FILE* file = stderr;
ulint i; ulint i;
fprintf(stderr, fprintf(stderr,