From 65399a4bb5d360a9a2988957cfab0ea2a35a63fa Mon Sep 17 00:00:00 2001
From: "mats@kindahl-laptop.dnsalias.net" <>
Date: Wed, 29 Aug 2007 16:06:59 +0200
Subject: BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail):

Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.

The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.
---
 sql/slave.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'sql/slave.h')

diff --git a/sql/slave.h b/sql/slave.h
index 731728bde4f..c7385934460 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -133,10 +133,6 @@ bool flush_relay_log_info(RELAY_LOG_INFO* rli);
 int register_slave_on_master(MYSQL* mysql);
 int terminate_slave_threads(MASTER_INFO* mi, int thread_mask,
 			     bool skip_lock = 0);
-int terminate_slave_thread(THD* thd, pthread_mutex_t* term_mutex,
-			   pthread_mutex_t* cond_lock,
-			   pthread_cond_t* term_cond,
-			   volatile uint* slave_running);
 int start_slave_threads(bool need_slave_mutex, bool wait_for_start,
 			MASTER_INFO* mi, const char* master_info_fname,
 			const char* slave_info_fname, int thread_mask);
-- 
cgit v1.2.1