From a2fb5dc56a458a043cdc5e3b71e2b24731ecc06c Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 23 May 2006 16:14:48 +0200
Subject: Cset exclude:
 msvensson@neptunus.(none)|ChangeSet|20060523082057|49143

sql/slave.cc:
  Exclude
---
 sql/slave.cc | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index 399a36ed077..fa7ccc4427d 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3950,20 +3950,11 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
   pthread_mutex_unlock(&LOCK_thread_count);
   pthread_cond_broadcast(&rli->stop_cond);
   // tell the world we are done
-
+  pthread_mutex_unlock(&rli->run_lock);
 #ifndef DBUG_OFF // TODO: reconsider the code below
   if (abort_slave_event_count && !rli->events_till_abort)
-  {
-    /*
-      Bug #19938 Valgrind error (race) in handle_slave_sql()
-      Read the value of rli->event_till_abort before releasing the mutex
-    */
-    pthread_mutex_unlock(&rli->run_lock);
     goto slave_begin;
-  }
-#endif
-  pthread_mutex_unlock(&rli->run_lock);
-
+#endif  
   my_thread_end();
   pthread_exit(0);
   DBUG_RETURN(0);				// Can't return anything here
-- 
cgit v1.2.1