post-merge fix

sql/event_scheduler.cc

@@ -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

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