Commit 11423e84 authored by andrey@lmy004's avatar andrey@lmy004

Merge lmy004.:/work/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release-17619-try3
parents 1372a7a9 30be7555
...@@ -3663,15 +3663,16 @@ sys_var_event_scheduler::update(THD *thd, set_var *var) ...@@ -3663,15 +3663,16 @@ sys_var_event_scheduler::update(THD *thd, set_var *var)
DBUG_RETURN(true); DBUG_RETURN(true);
} }
if (var->save_result.ulong_value < 1 || var->save_result.ulong_value > 2) if (var->save_result.ulonglong_value < 1 ||
var->save_result.ulonglong_value > 2)
{ {
char buf[64]; char buf[64];
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "event_scheduler", my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "event_scheduler",
llstr(var->save_result.ulong_value, buf)); llstr(var->save_result.ulonglong_value, buf));
DBUG_RETURN(true); DBUG_RETURN(true);
} }
if ((res= scheduler->suspend_or_resume(var->save_result.ulong_value == 1? if ((res= scheduler->suspend_or_resume(var->save_result.ulonglong_value == 1?
Event_scheduler::RESUME: Event_scheduler::RESUME :
Event_scheduler::SUSPEND))) Event_scheduler::SUSPEND)))
my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), (uint) res); my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), (uint) res);
DBUG_RETURN((bool) res); DBUG_RETURN((bool) res);
......
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