summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-01-11 18:09:17 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-01-11 18:09:17 +0100
commit887cf4ec9af106cc304849f9bca1ea238acde499 (patch)
tree1d76aa29e60e8ec3ab9aa1bb2268164948a01dfb
parent01c2de4077969c01736b3d584f4923638222b85f (diff)
downloadmariadb-git-887cf4ec9af106cc304849f9bca1ea238acde499.tar.gz
Fixing failing test case.
mysql-test/suite/rpl/r/rpl_init_slave.result: Result change. mysql-test/suite/rpl/t/rpl_init_slave.test: Starting and stopping slave to make sure that the init_slave variable is executed.
-rw-r--r--mysql-test/suite/rpl/r/rpl_init_slave.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_init_slave.test7
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_init_slave.result b/mysql-test/suite/rpl/r/rpl_init_slave.result
index 740c918976c..5c96293073c 100644
--- a/mysql-test/suite/rpl/r/rpl_init_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_init_slave.result
@@ -4,6 +4,8 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+stop slave;
+start slave;
show variables like 'init_slave';
Variable_name Value
init_slave set global max_connections=500
diff --git a/mysql-test/suite/rpl/t/rpl_init_slave.test b/mysql-test/suite/rpl/t/rpl_init_slave.test
index 6125f0a7c45..72ba60530b1 100644
--- a/mysql-test/suite/rpl/t/rpl_init_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_init_slave.test
@@ -4,6 +4,13 @@ source include/master-slave.inc;
# Test of init_slave variable
#
+connection slave;
+stop slave;
+source include/wait_for_slave_to_stop.inc;
+start slave;
+source include/wait_for_slave_to_start.inc;
+
+connection master;
save_master_pos;
connection slave;
show variables like 'init_slave';