summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_until.test
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-02-09 12:31:03 +0100
committermonty@mysql.com <>2004-02-09 12:31:03 +0100
commit06432eac3606d75045109e3bad2538543f1a574b (patch)
tree4cdb6965fba280ace2fc30421a0f25332597e43e /mysql-test/t/rpl_until.test
parent480b082cf44db4fb2722e256f16e5f8c7c537bcf (diff)
downloadmariadb-git-06432eac3606d75045109e3bad2538543f1a574b.tar.gz
Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments Fixed warnings from valgrind Fixed ref_length when used with HEAP tables More efficent need_conversion() Fixed error handling in UPDATE with not updateable tables Fixed bug in null handling in CAST to signed/unsigned
Diffstat (limited to 'mysql-test/t/rpl_until.test')
-rw-r--r--mysql-test/t/rpl_until.test5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test
index 4508fbea194..937a8c03f99 100644
--- a/mysql-test/t/rpl_until.test
+++ b/mysql-test/t/rpl_until.test
@@ -59,10 +59,11 @@ stop slave;
# this should stop immideately
start slave until master_log_file='master-bin.000001', master_log_pos=561;
---real-sleep 2;
+# 2 is not enough when running with valgrind
+--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 # 23 # 33 #
+--replace_column 1 # 9 # 12 # 23 # 33 #
show slave status;
#testing various error conditions