diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-29 15:08:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-29 15:08:44 +0100 |
| commit | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (patch) | |
| tree | 7d6a1d36b975e2b1bb8d9ffd3b7511ec0694349e /sql/slave.cc | |
| parent | 7dc48ae327ad27205dffe0cec16b445d01529f84 (diff) | |
| parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
| download | mariadb-git-0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0.tar.gz | |
10.0-base merge (roles)
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 52a8250e23f..c0608ad5cb7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3987,7 +3987,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 } @@ -4476,7 +4478,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 } |