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

Fixed compiler warnings from Windows compiler

Browse source 
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
This commit is contained in:
Michael Widenius 2010-08-11 13:55:54 +03:00
parent e6cf286b5d
commit 236478cef7
12 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/mysqlcheck.c
View file

@ -71,8 +71,8 @@ static struct my_option my_long_options[] =
&opt_auto_repair, &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0, &opt_auto_repair, &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0,
0, 0, 0, 0, 0}, 0, 0, 0, 0, 0},
{"character-sets-dir", OPT_CHARSETS_DIR, {"character-sets-dir", OPT_CHARSETS_DIR,
"Directory for character set files.", &charsets_dir, "Directory for character set files.", (char**) &charsets_dir,
&charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"check", 'c', "Check table for errors.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, {"check", 'c', "Check table for errors.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
0, 0, 0, 0}, 0, 0, 0, 0},
{"check-only-changed", 'C', {"check-only-changed", 'C',

8
client/mysqldump.c
View file

@ -211,8 +211,8 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
{"character-sets-dir", OPT_CHARSETS_DIR, {"character-sets-dir", OPT_CHARSETS_DIR,
"Directory for character set files.", &charsets_dir, "Directory for character set files.", (char**) &charsets_dir,
&charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"comments", 'i', "Write additional information.", {"comments", 'i', "Write additional information.",
&opt_comments, &opt_comments, 0, GET_BOOL, NO_ARG, &opt_comments, &opt_comments, 0, GET_BOOL, NO_ARG,
1, 0, 0, 0, 0, 0}, 1, 0, 0, 0, 0, 0},
@ -242,8 +242,8 @@ static struct my_option my_long_options[] =
{"debug", '#', "This is a non-debug version. Catch this and exit.", {"debug", '#', "This is a non-debug version. Catch this and exit.",
0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0}, 0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else #else
{"debug", '#', "Output debug log.", &default_dbug_option, {"debug", '#', "Output debug log.", (char**) &default_dbug_option,
&default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, (char**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
{"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit.", {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit.",
&debug_check_flag, &debug_check_flag, 0, &debug_check_flag, &debug_check_flag, 0,

4
client/mysqlimport.c
View file

@ -73,8 +73,8 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
{"character-sets-dir", OPT_CHARSETS_DIR, {"character-sets-dir", OPT_CHARSETS_DIR,
"Directory for character set files.", &charsets_dir, "Directory for character set files.", (char**) &charsets_dir,
&charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"default-character-set", OPT_DEFAULT_CHARSET, {"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", &default_charset, "Set the default character set.", &default_charset,
&default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

4
extra/my_print_defaults.c
View file

@ -55,8 +55,8 @@ static struct my_option my_long_options[] =
{"debug", '#', "This is a non-debug version. Catch this and exit", {"debug", '#', "This is a non-debug version. Catch this and exit",
0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0}, 0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else #else
{"debug", '#', "Output debug log", &default_dbug_option, {"debug", '#', "Output debug log", (char**) &default_dbug_option,
&default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, (char**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
{"defaults-file", 'c', "Like --config-file, except: if first option, " {"defaults-file", 'c', "Like --config-file, except: if first option, "
"then read this file only, do not read global or per-user config " "then read this file only, do not read global or per-user config "

1
mysql-test/mysql-test-run.pl
View file

@ -4038,6 +4038,7 @@ sub extract_warning_lines ($) {
qr/unknown variable 'loose-/, qr/unknown variable 'loose-/,
qr/Now setting lower_case_table_names to [02]/, qr/Now setting lower_case_table_names to [02]/,
qr/Setting lower_case_table_names=2/, qr/Setting lower_case_table_names=2/,
qr/You have forced lower_case_table_names to 0/,
qr/deprecated/, qr/deprecated/,
qr/Slave SQL thread retried transaction/, qr/Slave SQL thread retried transaction/,
qr/Slave \(additional info\)/, qr/Slave \(additional info\)/,

4
storage/maria/maria_pack.c
View file

@ -261,8 +261,8 @@ static struct my_option my_long_options[] =
{"backup", 'b', "Make a backup of the table as table_name.OLD.", {"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}, &backup, &backup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"character-sets-dir", OPT_CHARSETS_DIR_MP, {"character-sets-dir", OPT_CHARSETS_DIR_MP,
"Directory where character sets are.", &charsets_dir, "Directory where character sets are.", (char**) &charsets_dir,
&charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (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'.", {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"force", 'f', {"force", 'f',

8
storage/xtradb/buf/buf0lru.c
View file

@ -2131,7 +2131,7 @@ ibool
buf_LRU_file_dump(void) buf_LRU_file_dump(void)
/*===================*/ /*===================*/
{ {
os_file_t dump_file = -1; os_file_t dump_file = (os_file_t) -1;
ibool success; ibool success;
byte* buffer_base = NULL; byte* buffer_base = NULL;
byte* buffer = NULL; byte* buffer = NULL;
@ -2221,7 +2221,7 @@ buf_LRU_file_dump(void)
ret = TRUE; ret = TRUE;
end: end:
if (dump_file != -1) if (dump_file != (os_file_t) -1)
os_file_close(dump_file); os_file_close(dump_file);
if (buffer_base) if (buffer_base)
ut_free(buffer_base); ut_free(buffer_base);
@ -2235,7 +2235,7 @@ ibool
buf_LRU_file_restore(void) buf_LRU_file_restore(void)
/*======================*/ /*======================*/
{ {
os_file_t dump_file = -1; os_file_t dump_file = (os_file_t) -1;
ibool success; ibool success;
byte* buffer_base = NULL; byte* buffer_base = NULL;
byte* buffer = NULL; byte* buffer = NULL;
@ -2326,7 +2326,7 @@ buf_LRU_file_restore(void)
" (requested: %lu, read: %lu)\n", req, reads); " (requested: %lu, read: %lu)\n", req, reads);
ret = TRUE; ret = TRUE;
end: end:
if (dump_file != -1) if (dump_file != (os_file_t) -1)
os_file_close(dump_file); os_file_close(dump_file);
if (buffer_base) if (buffer_base)
ut_free(buffer_base); ut_free(buffer_base);

4
storage/xtradb/fil/fil0fil.c
View file

@ -3044,7 +3044,7 @@ fil_open_single_table_tablespace(
dulint new_id[31]; dulint new_id[31];
ulint root_page[31]; ulint root_page[31];
ulint n_index; ulint n_index;
os_file_t info_file = -1; os_file_t info_file = (os_file_t) -1;
char* info_file_path; char* info_file_path;
ulint i; ulint i;
int len; int len;
@ -3130,7 +3130,7 @@ fil_open_single_table_tablespace(
} }
skip_info: skip_info:
if (info_file != -1) if (info_file != (os_file_t) -1)
os_file_close(info_file); os_file_close(info_file);
/* /*

2
storage/xtradb/handler/i_s.cc
View file

@ -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[0], buf);
field_store_string(i_s_table->field[1], ptr); 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[3]->store(table->stat_clustered_index_size);
i_s_table->field[4]->store(table->stat_sum_of_other_index_sizes); i_s_table->field[4]->store(table->stat_sum_of_other_index_sizes);
i_s_table->field[5]->store(table->stat_modified_counter); i_s_table->field[5]->store(table->stat_modified_counter);

2
storage/xtradb/srv/srv0srv.c
View file

@ -2897,7 +2897,7 @@ loop:
if (bpl) { if (bpl) {
retry_flush_batch: retry_flush_batch:
n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST,
bpl, (ulint) bpl,
oldest_lsn + (lsn - lsn_old)); oldest_lsn + (lsn - lsn_old));
if (n_pages_flushed == ULINT_UNDEFINED) { if (n_pages_flushed == ULINT_UNDEFINED) {
os_thread_sleep(5000); os_thread_sleep(5000);

2
support-files/compiler_warnings.supp
View file

@ -44,6 +44,7 @@ buf/buf0buf\.c: .*block_mutex.* might be used uninitialized
btr/btr0cur\.c: null argument where non-null required: 1800-3000 btr/btr0cur\.c: null argument where non-null required: 1800-3000
btr/btr0btr\.c: null argument where non-null required: 2500-3000 btr/btr0btr\.c: null argument where non-null required: 2500-3000
ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000
fsp/fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits
# #
# bdb is not critical to keep up to date # bdb is not critical to keep up to date
@ -108,6 +109,7 @@ signal\.c : .*unused parameter.*
.* : conversion from '.*size_t' to 'UINT'.* .* : conversion from '.*size_t' to 'UINT'.*
.* : conversion from '.*size_t' to 'uInt'.* .* : conversion from '.*size_t' to 'uInt'.*
.* : conversion from '.*size_t' to 'uint16'.* .* : conversion from '.*size_t' to 'uint16'.*
.* : The following environment variables were not found.*
# #
# The following should be fixed by the ndb team # The following should be fixed by the ndb team

4
unittest/mytap/tap.h
View file

@ -106,7 +106,7 @@ extern int skip_big_tests;
@param count The planned number of tests to run. @param count The planned number of tests to run.
*/ */
void plan(int const count); void plan(int count);
/** /**
@ -125,7 +125,7 @@ void plan(int const count);
which case nothing is printed. which case nothing is printed.
*/ */
void ok(int const pass, char const *fmt, ...) void ok(int pass, char const *fmt, ...)
__attribute__((format(printf,2,3))); __attribute__((format(printf,2,3)));