Manual merge

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;
 }