diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-21 13:36:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-21 13:36:29 +0400 |
| commit | 046fe91161ebe40c9af4e1354587783d64f73ddd (patch) | |
| tree | 60bbb89dbf4d3136c8e1b77eef4a7600130a74a4 /sql | |
| parent | bff85079d32bd8860c86f6f4855db56961d3c56a (diff) | |
| parent | c63b72c968619feb0c6b36844c8cfdcddb724a7c (diff) | |
| download | mariadb-git-046fe91161ebe40c9af4e1354587783d64f73ddd.tar.gz | |
Merge 5.2 -> 5.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dde5dcc447e..053dcd29ef5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2207,7 +2207,7 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) /* It's safe to broadcast outside a lock (COND... is not deleted here) */ DBUG_PRINT("signal", ("Broadcasting COND_thread_count")); DBUG_LEAVE; // Must match DBUG_ENTER() -#ifndef EMBEDDED_LIBRARY +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) ERR_remove_state(0); #endif my_thread_end(); diff --git a/sql/slave.cc b/sql/slave.cc index cf238ca3a25..16764f439b6 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3031,7 +3031,9 @@ err_during_init: DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); +#ifdef HAVE_OPENSSL ERR_remove_state(0); +#endif pthread_exit(0); return 0; // Avoid compiler warnings } @@ -3434,7 +3436,9 @@ err_during_init: DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); +#ifdef HAVE_OPENSSL ERR_remove_state(0); +#endif pthread_exit(0); return 0; // Avoid compiler warnings } |