Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/set_var.cc: Auto merged
This commit is contained in:
commit
cd7b1fd9eb
@ -1296,7 +1296,7 @@ void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type)
|
||||
bool not_used;
|
||||
/* We will not come here if option_limits is not set */
|
||||
global_system_variables.*offset=
|
||||
(ulonglong) getopt_ull_limit_value((ulong) option_limits->def_value,
|
||||
(ulong) getopt_ull_limit_value((ulong) option_limits->def_value,
|
||||
option_limits, ¬_used);
|
||||
}
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user