diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
| commit | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch) | |
| tree | c6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /sql/events.cc | |
| parent | ff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff) | |
| parent | 6bf10fac445d73fb796d4863612c87bff5f28b66 (diff) | |
| download | mariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz | |
10.0-base merge
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 acf842dea44..040b73730e9 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() |