diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2013-07-24 15:44:41 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2013-07-24 15:44:41 +0530 |
| commit | 03940a7bd88131d3d9eacd1b2827f346d24e1483 (patch) | |
| tree | 1f9d55d7f07f747fa85ed65a74157afa6be9daf5 /sql/events.cc | |
| parent | b5071f8229f72efa447caa67bc38c8d70fdad5f3 (diff) | |
| download | mariadb-git-03940a7bd88131d3d9eacd1b2827f346d24e1483.tar.gz | |
Bug#16865959 - PLEASE BACKPORT BUG 14749800.
Since log_throttle is not available in 5.5. Logging of
error message for failure of thread to create new connection
in "create_thread_to_handle_connection" is not backported.
Since, function "my_plugin_log_message" is not available in
5.5 version and since there is incompatibility between
sql_print_XXX function compiled with g++ and alog files with
gcc to use sql_print_error, changes related to audit log
plugin is not backported.
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 2cedb007462..8ef90fdb622 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -798,6 +798,7 @@ Events::init(my_bool opt_noacl_or_bootstrap) { THD *thd; + int err_no; bool res= FALSE; DBUG_ENTER("Events::init"); @@ -869,7 +870,7 @@ Events::init(my_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 */ @@ -1017,9 +1018,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() |