Commit c67c49fc authored by unknown's avatar unknown

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
...@@ -544,7 +544,7 @@ error: ...@@ -544,7 +544,7 @@ error:
/* /*
Checkes whether the state of the scheduler is RUNNING Checks whether the state of the scheduler is RUNNING
SYNOPSIS SYNOPSIS
Event_scheduler::is_running() Event_scheduler::is_running()
......
...@@ -691,11 +691,9 @@ void ...@@ -691,11 +691,9 @@ void
Events::deinit() Events::deinit()
{ {
DBUG_ENTER("Events::deinit"); DBUG_ENTER("Events::deinit");
if (likely(!check_system_tables_error) && if (likely(!check_system_tables_error))
scheduler->get_state() > Event_scheduler::UNINITIALIZED)
{ {
scheduler->stop(); scheduler->stop();
DBUG_ASSERT(scheduler->get_state() == Event_scheduler::INITIALIZED);
scheduler->deinit_scheduler(); scheduler->deinit_scheduler();
event_queue->deinit_queue(); event_queue->deinit_queue();
......
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