summaryrefslogtreecommitdiff
path: root/mysql-test/include/master-slave.inc
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/include/master-slave.inc')
-rw-r--r--mysql-test/include/master-slave.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index 008466c426f..5ec4b4379f8 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -3,8 +3,11 @@ connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connection slave;
---error 0,1199
-!stop slave;
+#we expect STOP SLAVE to produce a warning as the slave is stopped
+#(the server was started with skip-slave-start)
+--disable_warnings
+stop slave;
+--enable_warnings
@r/slave-stopped.result show status like 'Slave_running';
connection master;
--disable_warnings