diff options
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_mdev359.test | 2 | ||||
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_mdev359.test b/mysql-test/suite/rpl/t/rpl_mdev359.test index fecb5c492b1..ef4e41f5291 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev359.test +++ b/mysql-test/suite/rpl/t/rpl_mdev359.test @@ -1,7 +1,7 @@ --source include/have_semisync_plugin.inc --source include/not_embedded.inc ---source include/have_binlog_format_mixed_or_statement.inc --source include/have_debug_sync.inc +--source include/have_binlog_format_mixed_or_statement.inc --source include/master-slave.inc # MDEV-359: There was a server crash when the code first checks if 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)); |