diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-11-25 17:14:08 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-11-25 17:14:08 +0200 |
| commit | 071edcfea05674f86926ee4c5fbf30f97c2ed368 (patch) | |
| tree | c33fbb7c8bc5d568650226c8d71496a3d47bc10c /sql/events.cc | |
| parent | 4f85baab95f50448930a8c9915f7178aa121e66e (diff) | |
| parent | 160236f880e92d2872d95ce72aab144f08456bcc (diff) | |
| download | mariadb-git-071edcfea05674f86926ee4c5fbf30f97c2ed368.tar.gz | |
Merge with MariaDB 5.5.34.
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 208914a4e6d..78226bbf7ef 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -800,6 +800,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 */ @@ -1019,9 +1020,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() |