diff options
| author | unknown <iggy@recycle.(none)> | 2007-04-23 14:37:32 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-04-23 14:37:32 -0400 |
| commit | d3fac6d2c2282fccb3995880135729a55a25dbdb (patch) | |
| tree | 04e0d756745f6041bc20766b07ca741bae9feb44 /sql/mysqld.cc | |
| parent | 0d5a18b53bd30af029b27e39579b52f05b8f7115 (diff) | |
| parent | 0b07ccbe85fc5b9b40ec23c33869267004ffa66b (diff) | |
| download | mariadb-git-d3fac6d2c2282fccb3995880135729a55a25dbdb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into recycle.(none):/src/bug25621/my51-bug25621
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6f7b8d53e05..b6b46524d3e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3622,8 +3622,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() |