From 7bcf5e2907db6a8f1178aca967c8d326be3e5e22 Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Wed, 7 Feb 2018 19:56:16 +0200 Subject: [PATCH] MDEV-15238 rpl.perf_buildin_semisync_issue40 sporadically fails on BB The test was used to result in mismatch due to unaccounted specifics of the master-slave handshake protocol that sets the Slave_IO_Running status to true while the semisync master status is set to active a bit later. The test is refined to expect that. --- ...semisync_issue40.result => rpl_semisync_ali_issues.result} | 0 ..._issue40-master.opt => rpl_semisync_ali_issues-master.opt} | 0 ...nc_issue40-slave.opt => rpl_semisync_ali_issues-slave.opt} | 0 ...din_semisync_issue40.test => rpl_semisync_ali_issues.test} | 4 ++++ 4 files changed, 4 insertions(+) rename mysql-test/suite/rpl/r/{perf_buildin_semisync_issue40.result => rpl_semisync_ali_issues.result} (100%) rename mysql-test/suite/rpl/t/{perf_buildin_semisync_issue40-master.opt => rpl_semisync_ali_issues-master.opt} (100%) rename mysql-test/suite/rpl/t/{perf_buildin_semisync_issue40-slave.opt => rpl_semisync_ali_issues-slave.opt} (100%) rename mysql-test/suite/rpl/t/{perf_buildin_semisync_issue40.test => rpl_semisync_ali_issues.test} (99%) diff --git a/mysql-test/suite/rpl/r/perf_buildin_semisync_issue40.result b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result similarity index 100% rename from mysql-test/suite/rpl/r/perf_buildin_semisync_issue40.result rename to mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result diff --git a/mysql-test/suite/rpl/t/perf_buildin_semisync_issue40-master.opt b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues-master.opt similarity index 100% rename from mysql-test/suite/rpl/t/perf_buildin_semisync_issue40-master.opt rename to mysql-test/suite/rpl/t/rpl_semisync_ali_issues-master.opt diff --git a/mysql-test/suite/rpl/t/perf_buildin_semisync_issue40-slave.opt b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues-slave.opt similarity index 100% rename from mysql-test/suite/rpl/t/perf_buildin_semisync_issue40-slave.opt rename to mysql-test/suite/rpl/t/rpl_semisync_ali_issues-slave.opt diff --git a/mysql-test/suite/rpl/t/perf_buildin_semisync_issue40.test b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test similarity index 99% rename from mysql-test/suite/rpl/t/perf_buildin_semisync_issue40.test rename to mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test index a12730fd8c9..52cd9e31753 100644 --- a/mysql-test/suite/rpl/t/perf_buildin_semisync_issue40.test +++ b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test @@ -210,6 +210,10 @@ START SLAVE IO_THREAD; --source include/wait_for_slave_io_to_start.inc connection con1; +--let $status_var= Rpl_semi_sync_master_status +--let $status_var_value=ON +--source include/wait_for_status_var.inc + SET GLOBAL rpl_semi_sync_master_timeout= 10000000; SET GLOBAL rpl_semi_sync_master_wait_no_slave= 1; INSERT INTO t1 values (4);