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 | 0ae219cd75eceebd8bc6f9148aff5f5db790f699 (patch) | |
| tree | 1f9d55d7f07f747fa85ed65a74157afa6be9daf5 /sql/slave.cc | |
| parent | 596e990263bc9b9600ebff8cbf87d0425cead312 (diff) | |
| download | mariadb-git-0ae219cd75eceebd8bc6f9148aff5f5db790f699.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/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 7fbe206c8a3..6e7c80e5803 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -709,6 +709,7 @@ int start_slave_thread( { pthread_t th; ulong start_id; + int error; DBUG_ENTER("start_slave_thread"); DBUG_ASSERT(mi->inited); @@ -735,9 +736,10 @@ int start_slave_thread( } start_id= *slave_run_id; DBUG_PRINT("info",("Creating new slave thread")); - if (mysql_thread_create(thread_key, - &th, &connection_attrib, h_func, (void*)mi)) + if ((error = mysql_thread_create(thread_key, + &th, &connection_attrib, h_func, (void*)mi))) { + sql_print_error("Can't create slave thread (errno= %d).", error); if (start_lock) mysql_mutex_unlock(start_lock); DBUG_RETURN(ER_SLAVE_THREAD); |