summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2008-08-25 10:57:34 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2008-08-25 10:57:34 -0300
commitd30db4c9e9fe2f8d5d1e92afb060a88d54434ea2 (patch)
tree1c6e131ab4101714d68da076a165a1c1a66a13e0 /mysys
parentcb8f52d243db88c3369a782610978e7defe4c4bd (diff)
parent1ee4a3ac823dc98a0abb70cd28ffbf6a10da221d (diff)
downloadmariadb-git-d30db4c9e9fe2f8d5d1e92afb060a88d54434ea2.tar.gz
Merge Bug#36579 into mysql-5.1-bugteam
Diffstat (limited to 'mysys')
-rw-r--r--mysys/thr_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 55b95407db5..b13e8411771 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -333,10 +333,10 @@ void thr_lock_init(THR_LOCK *lock)
void thr_lock_delete(THR_LOCK *lock)
{
DBUG_ENTER("thr_lock_delete");
- VOID(pthread_mutex_destroy(&lock->mutex));
pthread_mutex_lock(&THR_LOCK_lock);
thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);
pthread_mutex_unlock(&THR_LOCK_lock);
+ pthread_mutex_destroy(&lock->mutex);
DBUG_VOID_RETURN;
}