Auto merge with 5.1

mysys/my_gethostbyname.c

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

storage/xtradb/handler/i_s.cc

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

storage/xtradb/log/log0recv.c

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