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:
unknown 2007-12-21 12:02:49 +01:00
commit cd7b1fd9eb

View File

@ -1296,8 +1296,8 @@ 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,
option_limits, &not_used);
(ulong) getopt_ull_limit_value((ulong) option_limits->def_value,
option_limits, &not_used);
}
else
thd->variables.*offset= global_system_variables.*offset;