Commit 17395f03 authored by unknown's avatar unknown
Browse files

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

into lmy004.:/work/mysql-5.1-release-17619-try3
parents 36438eba 91de2afb

sql/set_var.cc

+5 −4
Original line number Diff line number Diff line
@@ -3663,14 +3663,15 @@ sys_var_event_scheduler::update(THD *thd, set_var *var) 
    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];

    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);

  }

  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::SUSPEND)))

    my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), (uint) res);