[Commits] 3126c69: fix test

sanja at mariadb.com sanja at mariadb.com
Fri Mar 6 16:51:32 EET 2015


revision-id: 3126c692302541ef3d8bc7510be42510dfd51d7e
parent(s): 8bae7b66a911ad4f275a146fe8a23c8fa3e8d387
committer: Oleksandr Byelkin
branch nick: server
timestamp: 2015-03-06 15:51:28 +0100
message:

fix test

---
 mysql-test/suite/rpl/r/rpl_set_statement_default_master.result | 5 +++++
 mysql-test/suite/rpl/t/rpl_set_statement_default_master.test   | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/mysql-test/suite/rpl/r/rpl_set_statement_default_master.result b/mysql-test/suite/rpl/r/rpl_set_statement_default_master.result
index 7398780..fdefdc9 100644
--- a/mysql-test/suite/rpl/r/rpl_set_statement_default_master.result
+++ b/mysql-test/suite/rpl/r/rpl_set_statement_default_master.result
@@ -12,3 +12,8 @@ Connection_name = 'm1'
 RESET SLAVE ALL;
 CHANGE MASTER 'm1' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_USER='root';
 SET STATEMENT default_master_connection = 'm1' FOR START SLAVE;
+set default_master_connection = 'm1';
+stop slave;
+include/wait_for_slave_to_stop.inc
+reset slave all;
+set default_master_connection = '';
diff --git a/mysql-test/suite/rpl/t/rpl_set_statement_default_master.test b/mysql-test/suite/rpl/t/rpl_set_statement_default_master.test
index 39309e4..106cb45 100644
--- a/mysql-test/suite/rpl/t/rpl_set_statement_default_master.test
+++ b/mysql-test/suite/rpl/t/rpl_set_statement_default_master.test
@@ -24,3 +24,11 @@ RESET SLAVE ALL;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 eval CHANGE MASTER 'm1' TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root';
 SET STATEMENT default_master_connection = 'm1' FOR START SLAVE;
+
+set default_master_connection = 'm1';
+stop slave;
+--source include/wait_for_slave_to_stop.inc
+reset slave all;
+set default_master_connection = '';
+--disconnect slave
+--connection default


More information about the commits mailing list