From e7362d457a41a8c8a1925c2d0be59df450511320 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Thu, 21 Jun 2012 19:02:53 +0200
Subject: MDEV-359: Fix another case where switch-off semisync could cause a
 race that ended with server crash.

This one was when the code releases and reaquires the lock with pthread_cond_wait() - and semisync is switched off meanwhile.
---
 plugin/semisync/semisync_master.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugin/semisync')

diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
index cb60d8e67d3..8573c4dcbde 100644
--- a/plugin/semisync/semisync_master.cc
+++ b/plugin/semisync/semisync_master.cc
@@ -744,6 +744,7 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
       must have been removed from ActiveTranx.
     */
     assert(thd_killed(NULL) ||
+           !getMasterEnabled() ||
            !active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
                                              trx_wait_binlog_pos));
     
-- 
cgit v1.2.1