From c9cbd6a48d47e94f480a09d6fd109bd39558bb21 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Dec 2007 22:00:42 +0100 Subject: [PATCH] Fixed errors in pushbuild by updating test and result files. mysql-test/suite/binlog/r/binlog_row_binlog.result: updated result file. This part of the test was created in parallel with the fix to bug#26395, which modifies the output of mysqlbinlog and hence the output of many tests, including this one. mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result: updated result file mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: 1. replaced include/show_slave_status.inc by more specific tests for the SQL error and IO error, as well as Slave_IO_State. 2. drop all tables at the end of test. --- .../suite/binlog/r/binlog_row_binlog.result | 4 ++ .../rpl_ndb/r/rpl_ndb_transaction.result | 52 +++++-------------- .../suite/rpl_ndb/t/rpl_ndb_transaction.test | 26 +++++++--- 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index fd91f65bbb5..6c5c149d48e 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -1099,9 +1099,11 @@ master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; create table t1 (a int) +master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t2` ( `a` int(11) DEFAULT NULL ) +master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t3` ( `a` int(11) DEFAULT NULL ) @@ -1124,9 +1126,11 @@ master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; create table t1 (a int) +master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t2` ( `a` int(11) DEFAULT NULL ) +master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t3` ( `a` int(11) DEFAULT NULL ) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result index b7479552eab..098f191c998 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result @@ -94,47 +94,21 @@ a 1 --- on slave --- STOP SLAVE; -SHOW SLAVE STATUS; -Slave_IO_State # -Master_Host 127.0.0.1 -Master_User root -Master_Port MASTER_PORT -Connect_Retry 1 -Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1740 -Relay_Log_File # -Relay_Log_Pos # -Relay_Master_Log_File master-bin.000001 -Slave_IO_Running No -Slave_SQL_Running No -Replicate_Do_DB -Replicate_Ignore_DB -Replicate_Do_Table -Replicate_Ignore_Table # -Replicate_Wild_Do_Table -Replicate_Wild_Ignore_Table -Last_Errno 0 -Last_Error -Skip_Counter 0 -Exec_Master_Log_Pos 1579 -Relay_Log_Space # -Until_Condition None -Until_Log_File -Until_Log_Pos 0 -Master_SSL_Allowed No -Master_SSL_CA_File -Master_SSL_CA_Path -Master_SSL_Cert -Master_SSL_Cipher -Master_SSL_Key -Seconds_Behind_Master # -Master_SSL_Verify_Server_Cert No -Last_IO_Errno # -Last_IO_Error # -Last_SQL_Errno 0 -Last_SQL_Error +SELECT "" AS Last_IO_Error; +Last_IO_Error + +SELECT "" AS Last_SQL_Error; +Last_SQL_Error + +SELECT "" AS Last_IO_Error; +Last_IO_Error + SELECT * FROM tinnodb ORDER BY a; a DROP TABLE tmyisam; DROP TABLE tinnodb; DROP TABLE tndb; +--- on master --- +DROP TABLE tmyisam; +DROP TABLE tinnodb; +DROP TABLE tndb; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test index 16870720e8c..03b43470270 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test @@ -82,10 +82,10 @@ SELECT * FROM tmyisam ORDER BY a; # the statement, and slave should roll back later when master is # restarted. -# However, we the master to be alive so that we are sure it replicates -# the statement to the slave. So in the test case, we must therefore -# not crash the master. Instead, we fake the crash by just not writing -# the XID event to the binlog. This is done by the +# However, we want the master to be alive so that we are sure it +# replicates the statement to the slave. So in the test case, we must +# therefore not crash the master. Instead, we fake the crash by just +# not writing the XID event to the binlog. This is done by the # --debug=d,do_not_write_xid flag in the .opt file. # So, unlike if the master had crashed, the master *will* execute the @@ -111,12 +111,24 @@ SELECT * FROM tinnodb ORDER BY a; --connection slave --sleep 3 STOP SLAVE; ---source include/show_slave_status.inc -# the following statement should show that nothing has been replicated +source include/wait_for_slave_to_stop.inc; +let $tmp= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1); +eval SELECT "$tmp" AS Slave_IO_State; +let $tmp= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); +eval SELECT "$tmp" AS Last_SQL_Error; +let $tmp= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1); +eval SELECT "$tmp" AS Last_IO_Error; SELECT * FROM tinnodb ORDER BY a; -# clean up +# Clean up. We cannot do it on master and replicate over, because +# master binlog is in a bad state after last test. So we do it both on +# master and on slave. +DROP TABLE tmyisam; +DROP TABLE tinnodb; +DROP TABLE tndb; +--echo --- on master --- +connection master; DROP TABLE tmyisam; DROP TABLE tinnodb; DROP TABLE tndb;