diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-02-05 08:10:20 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-02-05 08:10:20 -0700 |
| commit | 02fc9afe812f1aa5011371fac0a5a22c6bf90c5f (patch) | |
| tree | a28f45453cf3f630c23aab8f7672ad781028244a /sql/mysqld.cc | |
| parent | 13cb76f6fac7d088549dd8cffe14e3ff10ed0329 (diff) | |
| parent | 7366b09c2615e88f9cdfd3568daac334d030c666 (diff) | |
| download | mariadb-git-02fc9afe812f1aa5011371fac0a5a22c6bf90c5f.tar.gz | |
Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc
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 edcb29acf57..75ab43fe701 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2132,10 +2132,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 } |