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
18 years ago · f2953330d3
1 changed files with 2 additions and 2 deletions
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@ -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=
-      getopt_ull_limit_value((ulong) option_limits->def_value,
-                             option_limits, &not_used);
+      (ulonglong) getopt_ull_limit_value((ulong) option_limits->def_value,
+                                         option_limits, &not_used);
  }
  else
    thd->variables.*offset= global_system_variables.*offset;