From a2128b247faaf6b9c68b95e1a3c895c6ec58f500 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 17 Oct 2003 09:15:30 +0200 Subject: [PATCH] test update: what we want to detect in this test is if the slave stopped. mysql-test/r/rpl_trunc_binlog.result: result update mysql-test/t/rpl_trunc_binlog.test: what we want to detect in this test is if the slave stopped. --- mysql-test/r/rpl_trunc_binlog.result | 4 ---- mysql-test/t/rpl_trunc_binlog.test | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index a006437207a..19d5e30addb 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -8,7 +8,3 @@ stop slave; flush logs; reset slave; start slave; -show slave status; -Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 317 -reset master; diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index 2c34b7a442f..59d8aed288c 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -20,5 +20,4 @@ reset slave; start slave; # can't sync_with_master so we must sleep sleep 3; ---replace_result $MASTER_MYPORT MASTER_PORT -show slave status; +wait_for_slave_to_stop;