diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /sql/scheduler.cc | |
| parent | 915a624cbcb58a10a2cfb2e2e4fd5029191fa86a (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-29f0dcb56337a3e352ad7a70dcff6b25bb605325.tar.gz | |
Merge MySQL->MariaDB
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'sql/scheduler.cc')
| -rw-r--r-- | sql/scheduler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index f25ae2b663e..e0a7837de8e 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -235,9 +235,9 @@ void thd_scheduler::thread_detach() if (thread_attached) { THD* thd = (THD*)list.data; - pthread_mutex_lock(&thd->LOCK_delete); + pthread_mutex_lock(&thd->LOCK_thd_data); thd->mysys_var= NULL; - pthread_mutex_unlock(&thd->LOCK_delete); + pthread_mutex_unlock(&thd->LOCK_thd_data); thread_attached= FALSE; #ifndef DBUG_OFF /* @@ -481,7 +481,7 @@ static void libevent_add_connection(THD *thd) @brief Signal a waiting connection it's time to die. @details This function will signal libevent the THD should be killed. - Either the global LOCK_thd_count or the THD's LOCK_delete must be locked + Either the global LOCK_thd_count or the THD's LOCK_thd_data must be locked upon entry. @param[in] thd The connection to kill |