diff options
| -rw-r--r-- | mysql-test/r/rpl_trunc_binlog.result | 6 | ||||
| -rw-r--r-- | mysql-test/std_data/trunc_binlog.000001 | bin | 119 -> 174 bytes | |||
| -rw-r--r-- | mysql-test/t/rpl_trunc_binlog.test | 20 |
3 files changed, 20 insertions, 6 deletions
diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index 5eb5f810a8f..2663fffe4d4 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -6,8 +6,12 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; stop slave; flush logs; +create table t1 (a int) engine=bdb; reset slave; start slave; show slave status; Slave_IO_State 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 Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 # # master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log. 0 79 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 # # master-bin.000002 Yes Yes 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log. 0 4 # None 0 No # +select * from t1; +a +drop table t1; diff --git a/mysql-test/std_data/trunc_binlog.000001 b/mysql-test/std_data/trunc_binlog.000001 Binary files differindex 2c2b4ec6ce4..3da2490eab2 100644 --- a/mysql-test/std_data/trunc_binlog.000001 +++ b/mysql-test/std_data/trunc_binlog.000001 diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index b2e7e52f5e4..eec36532275 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -1,21 +1,28 @@ # We are testing if a binlog which contains BEGIN but not COMMIT (the -# master did while writing the transaction to the binlog) triggers an -# error on slave. So we use such a truncated binlog and simulate that +# master died while writing the transaction to the binlog) triggers a +# rollback on slave. So we use such a truncated binlog and simulate that # the master restarted after this. source include/master-slave.inc; connection slave; -# If we are not supporting transactions in the slave, the unfinished transaction -# won't cause any error, so we need to skip the test. In the 4.0 testsuite, the -# slave always runs without InnoDB, so we check for BDB. +# If we are not supporting transactions in the slave, the unfinished +# transaction won't cause any error, so we need to skip the test. In the 4.0 +# testsuite, the slave always runs without InnoDB, so we check for BDB. source include/have_bdb.inc; stop slave; + connection master; flush logs; system mv -f var/log/master-bin.000001 var/log/master-bin.000002; system cp std_data/trunc_binlog.000001 var/log/master-bin.000001; + connection slave; + +# truncated binlog contains: BEGIN; INSERT t1 VALUES (1); +# so let's create the table t1 on slave + +create table t1 (a int) engine=bdb; reset slave; start slave; # can't sync_with_master so we must sleep @@ -23,3 +30,6 @@ sleep 3; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # show slave status; +select * from t1; +drop table t1; + |