diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 14:45:08 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 14:45:08 -0300 |
commit | 0e6fcb393c0cd0ea6288d4b0c62f1bd6c0ea9ea3 (patch) | |
tree | 2c1b96fba8528b2f154fe867bd2ed49704e8d035 /sql/sys_vars.h | |
parent | aaf5f8d5c456a72b8d75013f534e12e92d2752c9 (diff) | |
download | mariadb-git-0e6fcb393c0cd0ea6288d4b0c62f1bd6c0ea9ea3.tar.gz |
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix compiler warnings due to: a mismatch in the prototypes for
check_access and implicit conversions from double to ulonglong
and vice-versa.
Diffstat (limited to 'sql/sys_vars.h')
-rw-r--r-- | sql/sys_vars.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index 18c073b1e90..ca3fc99deba 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -741,13 +741,13 @@ public: uint deprecated_version=0, const char *substitute=0, int parse_flag= PARSE_NORMAL) : sys_var(&all_sys_vars, name_arg, comment, flag_args, off, getopt.id, - getopt.arg_type, SHOW_DOUBLE, def_val, lock, binlog_status_arg, - on_check_func, on_update_func, deprecated_version, substitute, - parse_flag) + getopt.arg_type, SHOW_DOUBLE, (longlong) double2ulonglong(def_val), + lock, binlog_status_arg, on_check_func, on_update_func, + deprecated_version, substitute, parse_flag) { option.var_type= GET_DOUBLE; - option.min_value= min_val; - option.max_value= max_val; + option.min_value= (longlong) double2ulonglong(min_val); + option.max_value= (longlong) double2ulonglong(max_val); global_var(double)= (double)option.def_value; DBUG_ASSERT(min_val < max_val); DBUG_ASSERT(min_val <= def_val); |