diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-21 13:43:45 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-21 13:43:45 +0400 |
| commit | adbb4393586d46257a7d483212748df66261dca8 (patch) | |
| tree | 1312cc5b13624f680eb04caaa97a71078cfc9555 | |
| parent | dd6bd8bfbdbca81d356fcc30230cce0dedc3da84 (diff) | |
| parent | a06cd2cbe5ff0fa3e23ecac8a22ed99907f9c780 (diff) | |
| download | mariadb-git-adbb4393586d46257a7d483212748df66261dca8.tar.gz | |
Merge 5.5 -> 10.0-base
| -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 43bc11927d7..f9c6675400d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2702,7 +2702,7 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) mysql_mutex_unlock(&LOCK_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 f5f8b30c0a5..2c915e96aec 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3962,7 +3962,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 } @@ -4449,7 +4451,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 } |