summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-01-26 10:47:43 +0200
committerGeorgi Kodinov <joro@sun.com>2010-01-26 10:47:43 +0200
commit93dda2c670931ec8337fd75800a5dae2a757be50 (patch)
tree9806b80e75aa00ffea00dda0dffba1216733fdcb
parent8a66b424f3a3be667f4548f618377c2bd9b825ac (diff)
downloadmariadb-git-93dda2c670931ec8337fd75800a5dae2a757be50.tar.gz
fix a windows test run bug with debug binaries : dbug frame
should be exited before destroying the thread local storage.
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index db0453dc364..1fcd046f870 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1949,10 +1949,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();
(void) pthread_cond_broadcast(&COND_thread_count);
- DBUG_LEAVE; // Must match DBUG_ENTER()
pthread_exit(0);
return 0; // Avoid compiler warnings
}