Commit f8afc538 authored by serg@janus.mylan's avatar serg@janus.mylan
Browse files

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

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
parents d7457386 97754ffa

sql/set_var.cc

+2 −2
Original line number Diff line number Diff line
@@ -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=

      getopt_ull_limit_value((ulong) option_limits->def_value,

      (ulonglong) getopt_ull_limit_value((ulong) option_limits->def_value,

                                         option_limits, &not_used);

  }

  else