diff options
| author | unknown <andrey@fifo.vaih.whnetz> | 2006-08-31 17:20:16 +0200 |
|---|---|---|
| committer | unknown <andrey@fifo.vaih.whnetz> | 2006-08-31 17:20:16 +0200 |
| commit | bbd8f9aca56e4da7229db5db577852bf891c07ce (patch) | |
| tree | 2ed2ca726ac23a92bd9572722a4f8e40d647bc3a /sql/events.cc | |
| parent | f18ec676a0b0be35068e2c464b39d92ac143ec5c (diff) | |
| parent | 0410cc3a0c87582fe9d749f5e007dcdb1b9848e1 (diff) | |
| download | mariadb-git-bbd8f9aca56e4da7229db5db577852bf891c07ce.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
into fifo.vaih.whnetz:/work/mysql-5.1-wl3337-tree2
sql/events.cc:
Auto merged
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/events.cc b/sql/events.cc index f4b9b05179d..2afeb85367f 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -630,7 +630,7 @@ Events::init() } check_system_tables_error= FALSE; - if (event_queue->init_queue(thd, db_repository, scheduler)) + if (event_queue->init_queue(thd, db_repository)) { sql_print_error("SCHEDULER: Error while loading from disk."); goto end; @@ -820,7 +820,7 @@ Events::is_execution_of_events_started() my_error(ER_EVENTS_DB_ERROR, MYF(0)); DBUG_RETURN(FALSE); } - DBUG_RETURN(scheduler->get_state() == Event_scheduler::RUNNING); + DBUG_RETURN(scheduler->is_running()); } |