diff options
| -rw-r--r-- | mysys/my_getopt.c | 2 | ||||
| -rw-r--r-- | sql/sql_parse.h | 5 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 4 | ||||
| -rw-r--r-- | sql/sys_vars.h | 10 |
4 files changed, 10 insertions, 11 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 7443405f97c..e4b199dab84 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -1032,7 +1032,7 @@ static void init_one_value(const struct my_option *option, void *variable, *((ulonglong*) variable)= (ulonglong) value; break; case GET_DOUBLE: - *((double*) variable)= (double) value; + *((double*) variable)= ulonglong2double(value); break; case GET_STR: /* diff --git a/sql/sql_parse.h b/sql/sql_parse.h index df76df72e09..475811d45b7 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -183,9 +183,8 @@ inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list) inline bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc) { return false; } -inline bool check_access(THD *thd, ulong access, const char *db, - ulong *save_priv, bool no_grant, bool no_errors, - bool schema_db) +inline bool check_access(THD *, ulong, const char *, ulong *save_priv, + GRANT_INTERNAL_INFO *, bool, bool) { if (save_priv) *save_priv= GLOBAL_ACLS; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 53b07371baa..6e95961ebb0 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -942,10 +942,10 @@ static bool update_cached_long_query_time(sys_var *self, THD *thd, { if (type == OPT_SESSION) thd->variables.long_query_time= - thd->variables.long_query_time_double * 1e6; + double2ulonglong(thd->variables.long_query_time_double * 1e6); else global_system_variables.long_query_time= - global_system_variables.long_query_time_double * 1e6; + double2ulonglong(global_system_variables.long_query_time_double * 1e6); return false; } 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); |