diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test index 8f1d4ccaa42..faf961bb580 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test @@ -7,21 +7,21 @@ source include/master-slave.inc; let $engine_type= InnoDB; #let $engine_type= MyISAM; -# After fix of BUG#45848, semi-sync slave should not create any extra -# connections on master, save the count of connections before start -# semi-sync slave for comparison below. -let $_connections_normal_slave= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1); - # Suppress warnings that might be generated during the test disable_query_log; connection master; call mtr.add_suppression("Timeout waiting for reply of binlog"); +call mtr.add_suppression("Read semi-sync reply"); connection slave; -call mtr.add_suppression("Master server does not support"); -# These will be removed after fix bug#45852 -call mtr.add_suppression("Set 'rpl_semi_sync_master_reply_log_file_pos' on master failed"); -call mtr.add_suppression("Slave I/O: Fatal error: Failed to run 'after_queue_event' hook, Error_code: 1593"); +call mtr.add_suppression("Master server does not support semi-sync"); +call mtr.add_suppression("Semi-sync slave .* reply"); enable_query_log; +connection master; + +# After fix of BUG#45848, semi-sync slave should not create any extra +# connections on master, save the count of connections before start +# semi-sync slave for comparison below. +let $_connections_normal_slave= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1); --echo # --echo # Uninstall semi-sync plugins on master and slave diff --git a/plugin/semisync/semisync_slave.cc b/plugin/semisync/semisync_slave.cc index 6e773b2f743..109577fb688 100644 --- a/plugin/semisync/semisync_slave.cc +++ b/plugin/semisync/semisync_slave.cc @@ -39,16 +39,6 @@ int ReplSemiSyncSlave::initObject() return result; } -int ReplSemiSyncSlave::slaveReplyConnect() -{ - if (!mysql_reply && !(mysql_reply= rpl_connect_master(NULL))) - { - sql_print_error("Semisync slave connect to master for reply failed"); - return 1; - } - return 0; -} - int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header, unsigned long total_len, bool *need_reply, diff --git a/plugin/semisync/semisync_slave.h b/plugin/semisync/semisync_slave.h index f212911c49d..19ea43e2653 100644 --- a/plugin/semisync/semisync_slave.h +++ b/plugin/semisync/semisync_slave.h @@ -77,11 +77,6 @@ public: int slaveReply(MYSQL *mysql, const char *binlog_filename, my_off_t binlog_filepos); - /* - Connect to master for sending reply - */ - int slaveReplyConnect(); - int slaveStart(Binlog_relay_IO_param *param); int slaveStop(Binlog_relay_IO_param *param);