diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
| commit | d43afb8828e358f9c3bb690d0fdcd88b0637f155 (patch) | |
| tree | f977f3b5fa3c938183510750aecbea31bccc67ef /sql/events.cc | |
| parent | d0f77b83611077344ff29db02ea5593c9da62537 (diff) | |
| parent | 02765f4c614069ece1f30976848b6299ba6f24bd (diff) | |
| download | mariadb-git-d43afb8828e358f9c3bb690d0fdcd88b0637f155.tar.gz | |
Merge MariaDB-10.0.7 revision 3961.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/events.cc b/sql/events.cc index ea62ec4129d..082bd2ec485 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -791,6 +791,7 @@ Events::init(bool opt_noacl_or_bootstrap) { THD *thd; + int err_no; bool res= FALSE; DBUG_ENTER("Events::init"); @@ -871,7 +872,7 @@ Events::init(bool opt_noacl_or_bootstrap) } if (event_queue->init_queue(thd) || load_events_from_db(thd) || - (opt_event_scheduler == EVENTS_ON && scheduler->start())) + (opt_event_scheduler == EVENTS_ON && scheduler->start(&err_no))) { sql_print_error("Event Scheduler: Error while loading from disk."); res= TRUE; /* fatal error: request unireg_abort */ @@ -1033,9 +1034,9 @@ Events::dump_internal_status() DBUG_VOID_RETURN; } -bool Events::start() +bool Events::start(int *err_no) { - return scheduler->start(); + return scheduler->start(err_no); } bool Events::stop() |