diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-07-06 19:04:52 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-07-06 19:04:52 +0300 |
| commit | f27c26e95a3f40a5adbba714ea233748d52354e4 (patch) | |
| tree | fe36252eaa513afa9fbb486f7d91964de08b6f2a /sql | |
| parent | 69b817755a1c77a1b8a85843919f55e03400be98 (diff) | |
| download | mariadb-git-f27c26e95a3f40a5adbba714ea233748d52354e4.tar.gz | |
Fixed compiler warnings
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.h | 2 |
2 files changed, 2 insertions, 2 deletions
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, |