diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 12 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 7 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 410608f154f..9204f3ad72b 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1219,7 +1219,7 @@ static void throw_bounds_warning(THD *thd, const char *name, ulonglong num) static ulonglong fix_unsigned(THD *thd, ulonglong num, const struct my_option *option_limits) { - bool fixed= FALSE; + my_bool fixed= FALSE; ulonglong out= getopt_ull_limit_value(num, option_limits, &fixed); if (fixed) @@ -1279,7 +1279,7 @@ bool sys_var_long_ptr_global::update(THD *thd, set_var *var) void sys_var_long_ptr_global::set_default(THD *thd, enum_var_type type) { - bool not_used; + my_bool not_used; pthread_mutex_lock(guard); *value= (ulong) getopt_ull_limit_value((ulong) option_limits->def_value, option_limits, ¬_used); @@ -1302,7 +1302,7 @@ bool sys_var_ulonglong_ptr::update(THD *thd, set_var *var) void sys_var_ulonglong_ptr::set_default(THD *thd, enum_var_type type) { - bool not_used; + my_bool not_used; pthread_mutex_lock(&LOCK_global_system_variables); *value= getopt_ull_limit_value((ulonglong) option_limits->def_value, option_limits, ¬_used); @@ -1382,7 +1382,7 @@ void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) { - bool not_used; + my_bool not_used; /* We will not come here if option_limits is not set */ global_system_variables.*offset= (ulong) getopt_ull_limit_value((ulong) option_limits->def_value, @@ -1429,7 +1429,7 @@ void sys_var_thd_ha_rows::set_default(THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) { - bool not_used; + my_bool not_used; /* We will not come here if option_limits is not set */ pthread_mutex_lock(&LOCK_global_system_variables); global_system_variables.*offset= @@ -1481,7 +1481,7 @@ void sys_var_thd_ulonglong::set_default(THD *thd, enum_var_type type) { if (type == OPT_GLOBAL) { - bool not_used; + my_bool not_used; pthread_mutex_lock(&LOCK_global_system_variables); global_system_variables.*offset= getopt_ull_limit_value((ulonglong) option_limits->def_value, diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 2a86844c8c6..37bc3b730b0 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1876,7 +1876,7 @@ err: static int check_func_int(THD *thd, struct st_mysql_sys_var *var, void *save, st_mysql_value *value) { - bool fixed; + my_bool fixed; long long tmp; struct my_option options; value->val_int(value, &tmp); @@ -1904,7 +1904,7 @@ static int check_func_int(THD *thd, struct st_mysql_sys_var *var, static int check_func_long(THD *thd, struct st_mysql_sys_var *var, void *save, st_mysql_value *value) { - bool fixed; + my_bool fixed; long long tmp; struct my_option options; value->val_int(value, &tmp); @@ -1932,12 +1932,11 @@ static int check_func_long(THD *thd, struct st_mysql_sys_var *var, static int check_func_longlong(THD *thd, struct st_mysql_sys_var *var, void *save, st_mysql_value *value) { - bool fixed; + my_bool fixed; long long tmp; struct my_option options; value->val_int(value, &tmp); plugin_opt_set_limits(&options, var); - *(ulonglong *)save= getopt_ull_limit_value(tmp, &options, &fixed); if (var->flags & PLUGIN_VAR_UNSIGNED) *(ulonglong *)save= getopt_ull_limit_value((ulonglong) tmp, &options, |