Commit bf95cf16 authored by serg@janus.mylan's avatar serg@janus.mylan

Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
parents f8afc538 baf53c85
...@@ -1296,7 +1296,7 @@ void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type) ...@@ -1296,7 +1296,7 @@ void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type)
bool not_used; bool not_used;
/* We will not come here if option_limits is not set */ /* We will not come here if option_limits is not set */
global_system_variables.*offset= 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, &not_used); option_limits, &not_used);
} }
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment