summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_server_id2.test
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-05-05 21:50:51 +0200
committerunknown <guilhem@mysql.com>2004-05-05 21:50:51 +0200
commit601bdde5ed46117cd65c9cf5f660de29623637a3 (patch)
treeb1841cd19b1e4f007186f9cca7caff6ccd4404f0 /mysql-test/t/rpl_server_id2.test
parent40dba5a82f0c52107715f4de6420fd3ba911ed68 (diff)
downloadmariadb-git-601bdde5ed46117cd65c9cf5f660de29623637a3.tar.gz
very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update mysql-test/r/rpl_server_id2.result: result update mysql-test/t/rpl_server_id2.test: We stop the slave before cleaning up otherwise we'll get 'drop table t1' executed twice, so an error in the slave.err (not critical). sql/slave.cc: update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)
Diffstat (limited to 'mysql-test/t/rpl_server_id2.test')
-rw-r--r--mysql-test/t/rpl_server_id2.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/t/rpl_server_id2.test
index f022ab13188..dc8f733b7ed 100644
--- a/mysql-test/t/rpl_server_id2.test
+++ b/mysql-test/t/rpl_server_id2.test
@@ -18,4 +18,8 @@ insert into t1 values (1);
save_master_pos;
sync_with_master;
select * from t1; # check that indeed 2 were inserted
+# We stop the slave before cleaning up otherwise we'll get
+# 'drop table t1' executed twice, so an error in the slave.err
+# (not critical).
+stop slave;
drop table t1;