From d52f68f3548a6675d75557d90885f7e35d3f9a84 Mon Sep 17 00:00:00 2001
From: unknown <lars@mysql.com>
Date: Wed, 13 Jul 2005 04:00:55 +0200
Subject: [PATCH] Manual merge

---
 sql/slave.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index 33f27064aab..c6c0de7160b 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4968,7 +4968,6 @@ void rotate_relay_log(MASTER_INFO* mi)
 
   /* We don't lock rli->run_lock. This would lead to deadlocks. */
   pthread_mutex_lock(&mi->run_lock);
-  pthread_mutex_lock(&mi->data_lock);
 
   /* 
      We need to test inited because otherwise, new_file() will attempt to lock
@@ -4998,7 +4997,6 @@ void rotate_relay_log(MASTER_INFO* mi)
   */
   rli->relay_log.harvest_bytes_written(&rli->log_space_total);
 end:
-  pthread_mutex_unlock(&mi->data_lock);
   pthread_mutex_unlock(&mi->run_lock);
   DBUG_VOID_RETURN;
 }