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

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
f2953330 · unknown · fd1b1421 · 0c16a602 · f2953330
Commit f2953330 authored Dec 21, 2007 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/set_var.cc sql/set_var.cc +2 -2

No files found.
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -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