1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/misc/mysql/31177/50-31177

Browse Source 
into  mysql.com:/misc/mysql/31177/51-31177
This commit is contained in:
tnurnberg@white.intern.koehntopp.de 2007-12-06 01:46:49 +01:00
commit fe8d3dddf2
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sql/set_var.cc
View File

@ -122,6 +122,7 @@ static void fix_trans_mem_root(THD *thd, enum_var_type type);
static void fix_server_id(THD *thd, enum_var_type type); static void fix_server_id(THD *thd, enum_var_type type);
static ulonglong fix_unsigned(THD *thd, ulonglong num, static ulonglong fix_unsigned(THD *thd, ulonglong num,
const struct my_option *option_limits); const struct my_option *option_limits);
static bool get_unsigned(THD *thd, set_var *var);
static void throw_bounds_warning(THD *thd, const char *name, ulonglong num); static void throw_bounds_warning(THD *thd, const char *name, ulonglong num);
static KEY_CACHE *create_key_cache(const char *name, uint length); static KEY_CACHE *create_key_cache(const char *name, uint length);
void fix_sql_mode_var(THD *thd, enum_var_type type); void fix_sql_mode_var(THD *thd, enum_var_type type);
@ -1124,6 +1125,18 @@ static ulonglong fix_unsigned(THD *thd, ulonglong num,
return out; return out;
} }
static bool get_unsigned(THD *thd, set_var *var)
{
if (var->value->unsigned_flag)
var->save_result.ulonglong_value= (ulonglong) var->value->val_int();
else
{
longlong v= var->value->val_int();
var->save_result.ulonglong_value= (ulonglong) ((v < 0) ? 0 : v);
}
return 0;
}
sys_var_long_ptr:: sys_var_long_ptr::
sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_arg, sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_arg,
@ -1135,9 +1148,7 @@ sys_var_long_ptr(sys_var_chain *chain, const char *name_arg, ulong *value_ptr_ar
bool sys_var_long_ptr_global::check(THD *thd, set_var *var) bool sys_var_long_ptr_global::check(THD *thd, set_var *var)
{ {
longlong v= var->value->val_int(); return get_unsigned(thd, var);
var->save_result.ulonglong_value= v < 0 ? 0 : v;
return 0;
} }
bool sys_var_long_ptr_global::update(THD *thd, set_var *var) bool sys_var_long_ptr_global::update(THD *thd, set_var *var)
@ -1150,9 +1161,9 @@ bool sys_var_long_ptr_global::update(THD *thd, set_var *var)
{ {
#if SIZEOF_LONG < SIZEOF_LONG_LONG #if SIZEOF_LONG < SIZEOF_LONG_LONG
/* Avoid overflows on 32 bit systems */ /* Avoid overflows on 32 bit systems */
if (tmp > (ulonglong) ~(ulong) 0) if (tmp > ULONG_MAX)
{ {
tmp= ((ulonglong) ~(ulong) 0); tmp= ULONG_MAX;
throw_bounds_warning(thd, name, var->save_result.ulonglong_value); throw_bounds_warning(thd, name, var->save_result.ulonglong_value);
} }
#endif #endif
@ -1220,7 +1231,7 @@ uchar *sys_var_enum::value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
bool sys_var_thd_ulong::check(THD *thd, set_var *var) bool sys_var_thd_ulong::check(THD *thd, set_var *var)
{ {
return (sys_var_thd::check(thd, var) || return (get_unsigned(thd, var) ||
(check_func && (*check_func)(thd, var))); (check_func && (*check_func)(thd, var)));
} }
@ -1238,9 +1249,9 @@ bool sys_var_thd_ulong::update(THD *thd, set_var *var)
if (option_limits) if (option_limits)
tmp= (ulong) fix_unsigned(thd, tmp, option_limits); tmp= (ulong) fix_unsigned(thd, tmp, option_limits);
#if SIZEOF_LONG < SIZEOF_LONG_LONG #if SIZEOF_LONG < SIZEOF_LONG_LONG
else if (tmp > (ulonglong) ~(ulong) 0) else if (tmp > ULONG_MAX)
{ {
tmp= ((ulonglong) ~(ulong) 0); tmp= ULONG_MAX;
throw_bounds_warning(thd, name, var->save_result.ulonglong_value); throw_bounds_warning(thd, name, var->save_result.ulonglong_value);
} }
#endif #endif
@ -1320,6 +1331,11 @@ uchar *sys_var_thd_ha_rows::value_ptr(THD *thd, enum_var_type type,
return (uchar*) &(thd->variables.*offset); return (uchar*) &(thd->variables.*offset);
} }
bool sys_var_thd_ulonglong::check(THD *thd, set_var *var)
{
return get_unsigned(thd, var);
}
bool sys_var_thd_ulonglong::update(THD *thd, set_var *var) bool sys_var_thd_ulonglong::update(THD *thd, set_var *var)
{ {
ulonglong tmp= var->save_result.ulonglong_value; ulonglong tmp= var->save_result.ulonglong_value;

1
sql/set_var.h
View File

@ -379,6 +379,7 @@ public:
void set_default(THD *thd, enum_var_type type); void set_default(THD *thd, enum_var_type type);
SHOW_TYPE show_type() { return SHOW_LONGLONG; } SHOW_TYPE show_type() { return SHOW_LONGLONG; }
uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base);
bool check(THD *thd, set_var *var);
bool check_default(enum_var_type type) bool check_default(enum_var_type type)
{ {
return type == OPT_GLOBAL && !option_limits; return type == OPT_GLOBAL && !option_limits;