summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-02-14 09:53:01 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-02-14 09:53:01 +0100
commit29169c6b47109852b37dc57ac0603e04af0cdaa4 (patch)
treea37416e423387cb7e561fd2bdc41f32b388203f9
parent0f19e844d84e5de19842b86a63fba3bb509b7eac (diff)
downloadmariadb-git-29169c6b47109852b37dc57ac0603e04af0cdaa4.tar.gz
Fixes to try to handle valgrind warnings identical to those in
BUG#24387, which is closed since long. sql/mysqld.cc: Moving my_thread_end() to before pthread_cond_broadcast() since it might cause other threads to start using resources that are about to be released, or tries to proceed assuming that the resources have already been released.
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 08ecc025332..9c4e6f9e2a2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1869,9 +1869,9 @@ 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"));
+ my_thread_end();
(void) pthread_cond_broadcast(&COND_thread_count);
- my_thread_end();
pthread_exit(0);
DBUG_RETURN(0); // Impossible
}