database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed compiler warnings

Browse Source 
client/mysqltest.cc:
  Added cast
plugin/feedback/utils.cc:
  Added #ifdef
sql/sql_select.cc:
  Added cast
sql/sys_vars.h:
  Changed limits to int
support-files/compiler_warnings.supp:
  Added suppression
This commit is contained in:
Michael Widenius
2012-07-06 19:04:52 +03:00
parent 69b817755a
commit f27c26e95a
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.cc
View File

@ -5144,7 +5144,7 @@ typedef struct
static st_error global_error_names[] = static st_error global_error_names[] =
{ {
{ "<No error>", -1, "" }, { "<No error>", (uint) -1, "" },
#include <mysqld_ername.h> #include <mysqld_ername.h>
{ 0, 0, 0 } { 0, 0, 0 }
}; };

2
plugin/feedback/utils.cc
View File

@ -334,8 +334,10 @@ int prepare_linux_info()
*/ */
int fill_linux_info(THD *thd, TABLE_LIST *tables) int fill_linux_info(THD *thd, TABLE_LIST *tables)
{ {
#if defined(HAVE_SYS_UTSNAME_H) || defined(TARGET_OS_LINUX)
TABLE *table= tables->table; TABLE *table= tables->table;
CHARSET_INFO *cs= system_charset_info; CHARSET_INFO *cs= system_charset_info;
#endif
#ifdef HAVE_SYS_UTSNAME_H #ifdef HAVE_SYS_UTSNAME_H
if (have_ubuf) if (have_ubuf)

2
sql/sql_select.cc
View File

@ -6651,7 +6651,7 @@ double JOIN::get_examined_rows()
while ((tab= next_breadth_first_tab(this, tab))) while ((tab= next_breadth_first_tab(this, tab)))
{ {
prev_fanout *= prev_tab->records_read; prev_fanout *= prev_tab->records_read;
examined_rows+= tab->get_examined_rows() * prev_fanout; examined_rows+= (ha_rows) (tab->get_examined_rows() * prev_fanout);
prev_tab= tab; prev_tab= tab;
} }
return examined_rows; return examined_rows;

2
sql/sys_vars.h
View File

@ -957,7 +957,7 @@ public:
Sys_var_max_user_conn(const char *name_arg, Sys_var_max_user_conn(const char *name_arg,
const char *comment, int flag_args, ptrdiff_t off, size_t size, const char *comment, int flag_args, ptrdiff_t off, size_t size,
CMD_LINE getopt, CMD_LINE getopt,
uint min_val, uint max_val, uint def_val, int min_val, int max_val, uint def_val,
uint block_size, PolyLock *lock=0, uint block_size, PolyLock *lock=0,
enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG, enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
on_check_function on_check_func=0, on_check_function on_check_func=0,

2
support-files/compiler_warnings.supp
View File

@ -43,7 +43,7 @@ ut/ut0ut\.c: ignoring return value of
srv/srv0srv\.c: value computed is not used srv/srv0srv\.c: value computed is not used
buf/buf0buf\.c: .*block_mutex.* might be used uninitialized 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
btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 btr/btr0cur\.c: .*value computed is not used.*: 3175-3375
btr/btr0sea\.c: passing argument 2 .* discards qualifiers from pointer target type btr/btr0sea\.c: passing argument 2 .* discards qualifiers from pointer target type
ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000