summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-02-10 02:24:10 +0200
committerunknown <bell@sanja.is.com.ua>2004-02-10 02:24:10 +0200
commit2282ec0f81360b477c2dec81e25a4bdafd0bce69 (patch)
tree69a6614a7e21470c9758d001da0af86201529f37 /mysql-test/t
parentecb11989ad22af2cdd2359dbb96705af240f1c84 (diff)
parentd5b3cb44b9a96d2154af4b0b7520f1e2cd3d3e58 (diff)
downloadmariadb-git-2282ec0f81360b477c2dec81e25a4bdafd0bce69.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/rpl_until.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test
index 937a8c03f99..40d36110296 100644
--- a/mysql-test/t/rpl_until.test
+++ b/mysql-test/t/rpl_until.test
@@ -60,10 +60,10 @@ stop slave;
# this should stop immideately
start slave until master_log_file='master-bin.000001', master_log_pos=561;
# 2 is not enough when running with valgrind
---real-sleep 4;
+real_sleep 4
# here the sql slave thread should be stopped
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
---replace_column 1 # 9 # 12 # 23 # 33 #
+--replace_column 1 # 9 # 23 # 33 #
show slave status;
#testing various error conditions