From: Date: August 25 2008 4:01pm
Subject: bzr push into mysql-5.1 branch (davi:2719 to 2720) Bug#36579
List-Archive: http://lists.mysql.com/commits/52462
X-Bug: 36579
Message-Id: <20080825140124.02CCCEC298@skynet.ctb.virtua.com.br>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2720 Davi Arnaut	2008-08-25 [merge]
      Merge Bug#36579 into mysql-5.1-bugteam
modified:
  mysys/thr_lock.c

 2719 Sergey Glukhov	2008-08-25 [merge]
      null merge

=== modified file 'mysys/thr_lock.c'
--- a/mysys/thr_lock.c	2008-02-18 22:36:57 +0000
+++ b/mysys/thr_lock.c	2008-08-25 13:57:34 +0000
@@ -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;
 }