summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl000001.test
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-08-11 22:44:43 +0300
committermonty@mashka.mysql.fi <>2003-08-11 22:44:43 +0300
commit2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch)
tree3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /mysql-test/t/rpl000001.test
parent1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff)
parent6e7a509d06824447e427dd44d5692489267d9c4b (diff)
downloadmariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz
Merge with 4.0.14
Diffstat (limited to 'mysql-test/t/rpl000001.test')
-rw-r--r--mysql-test/t/rpl000001.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index d562a47ef90..f464f1e2751 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -90,8 +90,8 @@ connection master;
--error 1053;
reap;
connection slave;
-sync_with_master;
-#give the slave a chance to exit
+# The SQL slave thread should now have stopped because the query was killed on
+# the master (so it has a non-zero error code in the binlog).
wait_for_slave_to_stop;
# The following test can't be done because the result of Pos will differ