diff options
| -rw-r--r-- | client/mysqltest.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/utils.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.h | 2 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 01613223d64..3bae2bfbc9d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5144,7 +5144,7 @@ typedef struct static st_error global_error_names[] = { - { "<No error>", -1, "" }, + { "<No error>", (uint) -1, "" }, #include <mysqld_ername.h> { 0, 0, 0 } }; diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index f81fde2ab8f..8043c46816e 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -334,8 +334,10 @@ int prepare_linux_info() */ int fill_linux_info(THD *thd, TABLE_LIST *tables) { +#if defined(HAVE_SYS_UTSNAME_H) || defined(TARGET_OS_LINUX) TABLE *table= tables->table; CHARSET_INFO *cs= system_charset_info; +#endif #ifdef HAVE_SYS_UTSNAME_H if (have_ubuf) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5dfd4b6c9d3..0c1fb07d761 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6651,7 +6651,7 @@ double JOIN::get_examined_rows() while ((tab= next_breadth_first_tab(this, tab))) { 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; } return examined_rows; diff --git a/sql/sys_vars.h b/sql/sys_vars.h index 4ea6b1f036e..c680ce6ab51 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -957,7 +957,7 @@ public: Sys_var_max_user_conn(const char *name_arg, const char *comment, int flag_args, ptrdiff_t off, size_t size, 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, enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG, on_check_function on_check_func=0, diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 0184c73dac8..4d8478828c2 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -43,7 +43,7 @@ ut/ut0ut\.c: ignoring return value of srv/srv0srv\.c: value computed is not used buf/buf0buf\.c: .*block_mutex.* might be used uninitialized 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/btr0sea\.c: passing argument 2 .* discards qualifiers from pointer target type ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 |