Fixed compiler warnings from Windows compiler

client/mysqlcheck.c:
  Added missing casts
client/mysqldump.c:
  Added missing casts
client/mysqlimport.c:
  Added missing casts
extra/my_print_defaults.c:
  Added missing casts
mysql-test/mysql-test-run.pl:
  Added suppression for non-critical warning on windows
storage/maria/maria_pack.c:
  Added missing casts
storage/xtradb/buf/buf0lru.c:
  Added missing casts
storage/xtradb/fil/fil0fil.c:
  Added missing casts
storage/xtradb/handler/i_s.cc:
  Added extra argument to call store() function for longlong.
storage/xtradb/srv/srv0srv.c:
  Added cast to suppress compiler warning
support-files/compiler_warnings.supp:
  Added suppression for some non critical compiler warnings on Windows
unittest/mytap/tap.h:
  Fixed prototypes to be same as the actual functions

5 files changed, 10 insertions, 10 deletions

diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c
index 0673f571a6b..167d0af3078 100644
--- a/storage/maria/maria_pack.c
+++ b/storage/maria/maria_pack.c
@@ -261,8 +261,8 @@ static struct my_option my_long_options[] =
   {"backup", 'b', "Make a backup of the table as table_name.OLD.",
    &backup, &backup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR_MP,
-   "Directory where character sets are.", &charsets_dir,
-   &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   "Directory where character sets are.", (char**) &charsets_dir,
+   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"force", 'f',
diff --git a/storage/xtradb/buf/buf0lru.c b/storage/xtradb/buf/buf0lru.c
index 65fdf342e4f..7b01c4aec50 100644
--- a/storage/xtradb/buf/buf0lru.c
+++ b/storage/xtradb/buf/buf0lru.c
@@ -2131,7 +2131,7 @@ ibool
 buf_LRU_file_dump(void)
 /*===================*/
 {
-	os_file_t	dump_file = -1;
+	os_file_t	dump_file = (os_file_t) -1;
 	ibool		success;
 	byte*		buffer_base = NULL;
 	byte*		buffer = NULL;
@@ -2221,7 +2221,7 @@ buf_LRU_file_dump(void)
 
 	ret = TRUE;
 end:
-	if (dump_file != -1)
+	if (dump_file != (os_file_t) -1)
 		os_file_close(dump_file);
 	if (buffer_base)
 		ut_free(buffer_base);
@@ -2235,7 +2235,7 @@ ibool
 buf_LRU_file_restore(void)
 /*======================*/
 {
-	os_file_t	dump_file = -1;
+	os_file_t	dump_file = (os_file_t) -1;
 	ibool		success;
 	byte*		buffer_base = NULL;
 	byte*		buffer = NULL;
@@ -2326,7 +2326,7 @@ buf_LRU_file_restore(void)
 		" (requested: %lu, read: %lu)\n", req, reads);
 	ret = TRUE;
 end:
-	if (dump_file != -1)
+	if (dump_file != (os_file_t) -1)
 		os_file_close(dump_file);
 	if (buffer_base)
 		ut_free(buffer_base);
diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c
index bb1eed2a1e3..d69e5859d99 100644
--- a/storage/xtradb/fil/fil0fil.c
+++ b/storage/xtradb/fil/fil0fil.c
@@ -3044,7 +3044,7 @@ fil_open_single_table_tablespace(
 		dulint		new_id[31];
 		ulint		root_page[31];
 		ulint		n_index;
-		os_file_t	info_file = -1;
+		os_file_t	info_file = (os_file_t) -1;
 		char*		info_file_path;
 		ulint	i;
 		int		len;
@@ -3130,7 +3130,7 @@ fil_open_single_table_tablespace(
 		}
 
 skip_info:
-		if (info_file != -1)
+		if (info_file != (os_file_t) -1)
 			os_file_close(info_file);
 
 		/*
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index c48676c2892..5b5d5ef7186 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -2821,7 +2821,7 @@ i_s_innodb_table_stats_fill(
 
 		field_store_string(i_s_table->field[0], buf);
 		field_store_string(i_s_table->field[1], ptr);
-		i_s_table->field[2]->store(table->stat_n_rows);
+		i_s_table->field[2]->store(table->stat_n_rows, 1);
 		i_s_table->field[3]->store(table->stat_clustered_index_size);
 		i_s_table->field[4]->store(table->stat_sum_of_other_index_sizes);
 		i_s_table->field[5]->store(table->stat_modified_counter);
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c
index 86bf309bac1..bc2dd562697 100644
--- a/storage/xtradb/srv/srv0srv.c
+++ b/storage/xtradb/srv/srv0srv.c
@@ -2897,7 +2897,7 @@ loop:
 					if (bpl) {
 retry_flush_batch:
 						n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST,
-									bpl,
+									(ulint) bpl,
 									oldest_lsn + (lsn - lsn_old));
 						if (n_pages_flushed == ULINT_UNDEFINED) {
 							os_thread_sleep(5000);