Commit a06cd2cb authored by Alexander Barkov's avatar Alexander Barkov

Merge 5.3 -> 5.5

parents 11005f34 046fe911
...@@ -2615,7 +2615,7 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache) ...@@ -2615,7 +2615,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) */ /* It's safe to broadcast outside a lock (COND... is not deleted here) */
DBUG_PRINT("signal", ("Broadcasting COND_thread_count")); DBUG_PRINT("signal", ("Broadcasting COND_thread_count"));
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
#ifndef EMBEDDED_LIBRARY #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
ERR_remove_state(0); ERR_remove_state(0);
#endif #endif
my_thread_end(); my_thread_end();
......
...@@ -3377,7 +3377,9 @@ log space"); ...@@ -3377,7 +3377,9 @@ log space");
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
#ifdef HAVE_OPENSSL
ERR_remove_state(0); ERR_remove_state(0);
#endif
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }
...@@ -3783,7 +3785,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ ...@@ -3783,7 +3785,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
#ifdef HAVE_OPENSSL
ERR_remove_state(0); ERR_remove_state(0);
#endif
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment