diff options
| author | unknown <dlenev@dlenev.mshome> | 2003-09-14 17:18:38 +0400 |
|---|---|---|
| committer | unknown <dlenev@dlenev.mshome> | 2003-09-14 17:18:38 +0400 |
| commit | b15eba8820b0a99edf4163c008dde6f131bac18b (patch) | |
| tree | c4742d385e2c5c028bf30edc3e67fd1e061526f9 /mysql-test/t/rpl_until.test | |
| parent | 1f82a0de6c841fc2b58cd45caf3ebeafce47d861 (diff) | |
| download | mariadb-git-b15eba8820b0a99edf4163c008dde6f131bac18b.tar.gz | |
Post merge fixes. Fixed tests after adding UNTIL conditions
to SHOW SLAVE STATUS.
mysql-test/r/rpl000015.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_error_ignored_table.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_flush_log_loop.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_reset_slave.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_until.result:
Post merge fix
mysql-test/t/rpl_until.test:
Post merge fix
Diffstat (limited to 'mysql-test/t/rpl_until.test')
| -rw-r--r-- | mysql-test/t/rpl_until.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test index 77e29057357..8845cf205a9 100644 --- a/mysql-test/t/rpl_until.test +++ b/mysql-test/t/rpl_until.test @@ -55,15 +55,15 @@ sleep 2; show slave status; #testing various error conditions ---error 1272 +--error 1276 start slave until master_log_file='master-bin', master_log_pos=561; ---error 1272 +--error 1276 start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12; ---error 1272 +--error 1276 start slave until master_log_file='master-bin.000001'; ---error 1272 +--error 1276 start slave until relay_log_file='slave-relay-bin.000002'; ---error 1272 +--error 1276 start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; start slave sql_thread; |