post-merge fix

af07dcd3 · andrey@example.com · 366f0ca7 · af07dcd3 · af07dcd3
Commit af07dcd3 authored Sep 01, 2006 by andrey@example.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

sql/event_scheduler.cc sql/event_scheduler.cc +1 -1

sql/events.cc sql/events.cc +1 -3

No files found.
--- a/sql/event_scheduler.cc
+++ b/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()

--- a/sql/events.cc
+++ b/sql/events.cc
@@ -691,11 +691,9 @@ void
 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();
-    DBUG_ASSERT(scheduler->get_state() == Event_scheduler::INITIALIZED);  
    scheduler->deinit_scheduler();
    event_queue->deinit_queue();