Commit c63b72c9 authored by Alexander Barkov's avatar Alexander Barkov

Merge 5.1 -> 5.2

parents 2b60ad36 11d14100
......@@ -2134,7 +2134,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();
......
......@@ -2855,7 +2855,9 @@ err:
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
}
......@@ -3252,7 +3254,9 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
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
}
......
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