summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authoriggy@recycle.(none) <>2007-04-23 14:28:33 -0400
committeriggy@recycle.(none) <>2007-04-23 14:28:33 -0400
commit30d6cf311a3f07f0655679291360fdf99af32bca (patch)
treefaafa4372a83d11bc937c6690a0db696f1349283 /sql
parent09cfc052f74b18ca31037a77f495eb5edeadabd4 (diff)
downloadmariadb-git-30d6cf311a3f07f0655679291360fdf99af32bca.tar.gz
Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit
- On Windows, connection handlers while exiting properly did not decrement the server's thread count.
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b0fc5a30ff5..97f03e3efc2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3400,8 +3400,9 @@ void decrement_handler_count()
{
pthread_mutex_lock(&LOCK_thread_count);
handler_count--;
- pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_signal(&COND_handler_count);
+ pthread_mutex_unlock(&LOCK_thread_count);
+ my_thread_end();
}
#else
#define decrement_handler_count()