diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
| commit | 7257047dcefd2f2250e629b2aa3bcd84f980cf90 (patch) | |
| tree | ccd7ed37b88de38a47462ff2a6c95aec6ad8bc08 /sql/mysqld.cc | |
| parent | 4d0b901a55e1f27cb7e5caedced1ebbb923d366b (diff) | |
| parent | b38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff) | |
| download | mariadb-git-7257047dcefd2f2250e629b2aa3bcd84f980cf90.tar.gz | |
merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3f515562145..cfbf46819fe 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2135,10 +2135,10 @@ 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() my_thread_end(); mysql_cond_broadcast(&COND_thread_count); - DBUG_LEAVE; // Must match DBUG_ENTER() pthread_exit(0); return 0; // Avoid compiler warnings } |