From 11d141004af2507cd15751bad7378851a9347527 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 21 Oct 2013 13:34:18 +0400 Subject: [PATCH] A clean-up for DEV-4890 Valgrind warnings on shutdown on a build with openSSL --- sql/mysqld.cc | 2 +- sql/slave.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b709d71f817..a92fe49e2bf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2094,7 +2094,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 202e624ce71..7941e632124 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2854,7 +2854,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 } @@ -3251,7 +3253,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 }