diff options
| author | andrey@example.com <> | 2006-09-01 14:08:50 +0200 |
|---|---|---|
| committer | andrey@example.com <> | 2006-09-01 14:08:50 +0200 |
| commit | af07dcd3354503bfaa201acb921ec2bcdecf8402 (patch) | |
| tree | e361d3fd32f273dc7ffabe0695719532c6b9e4de | |
| parent | 366f0ca74db20b688ece173e7cf3b461a7b3a15f (diff) | |
| download | mariadb-git-af07dcd3354503bfaa201acb921ec2bcdecf8402.tar.gz | |
post-merge fix
| -rw-r--r-- | sql/event_scheduler.cc | 2 | ||||
| -rw-r--r-- | sql/events.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index 6423f3676fc..c16b528004b 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -544,7 +544,7 @@ error: /* - Checkes whether the state of the scheduler is RUNNING + Checks whether the state of the scheduler is RUNNING SYNOPSIS Event_scheduler::is_running() diff --git a/sql/events.cc b/sql/events.cc index f43ef751726..c3994dcd396 100644 --- 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) && - 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(); |