summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_until.test
diff options
context:
space:
mode:
authorpem@mysql.com <>2004-04-07 19:07:44 +0200
committerpem@mysql.com <>2004-04-07 19:07:44 +0200
commitdfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch)
treee5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /mysql-test/t/rpl_until.test
parent1541f2e7949416d6e172ef6406ecf140d3b26659 (diff)
parent61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff)
downloadmariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz
Merge 4.1 -> 5.0.
Diffstat (limited to 'mysql-test/t/rpl_until.test')
-rw-r--r--mysql-test/t/rpl_until.test10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test
index 545b495938a..f7ca51ecabc 100644
--- a/mysql-test/t/rpl_until.test
+++ b/mysql-test/t/rpl_until.test
@@ -67,15 +67,15 @@ real_sleep 4
show slave status;
#testing various error conditions
---error 1276
+--error 1277
start slave until master_log_file='master-bin', master_log_pos=561;
---error 1276
+--error 1277
start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
---error 1276
+--error 1277
start slave until master_log_file='master-bin.000001';
---error 1276
+--error 1277
start slave until relay_log_file='slave-relay-bin.000002';
---error 1276
+--error 1277
start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
start slave sql_thread;