Commit c67c49fc authored by unknown's avatar unknown
Browse files

post-merge fix 


sql/event_scheduler.cc:
  fix typo
sql/events.cc:
  This check is not needed since UNINITIALIZED state was introduced
  in the Event_scheduler
parent 33b8dbc7

sql/event_scheduler.cc

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ Event_scheduler::execute_top(THD *thd, Event_job_data *job_data) 




/*

  Checkes whether the state of the scheduler is RUNNING

  Checks whether the state of the scheduler is RUNNING



  SYNOPSIS

    Event_scheduler::is_running()

sql/events.cc

+1 −3
Original line number Diff line number Diff line
@@ -691,11 +691,9 @@ void 
Events::deinit()

{

  DBUG_ENTER("Events::deinit");

  if (likely(!check_system_tables_error) &&

      scheduler->get_state() > Event_scheduler::UNINITIALIZED)

  if (likely(!check_system_tables_error))

  {

    scheduler->stop();

    DBUG_ASSERT(scheduler->get_state() == Event_scheduler::INITIALIZED);  

    scheduler->deinit_scheduler();



    event_queue->deinit_queue();