MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Luis Soares Date:February 14 2011 4:32pm
Subject:bzr commit into mysql-trunk branch (luis.soares:3647) Bug#11765599
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/bugfixing/58584/push/mysql-trunk/ based on revid:luis.soares@stripped

 3647 Luis Soares	2011-02-14
      BUG#11765599: 58584: MOVE TIMESTAMPS IN SLAVE_[SQL|IO]_ERROR TO 
                    SEPARATE COLUMNS
      
      Adding test comments as suggested by reviewer for expected 
      error codes.

    modified:
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_show_errors.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_middle_group.test'
--- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-02-07 15:31:01 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-02-14 16:32:36 +0000
@@ -84,7 +84,7 @@ connection slave;
 # slave will catch the killed status, won't shut down immediately
 # but does it eventually having the whole group unfinished (not committed)
 
---let $slave_sql_errno= 1593
+let $slave_sql_errno= 1593; # ER_SLAVE_FATAL_ERROR
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 
@@ -128,7 +128,7 @@ connection slave;
 # 
 
 # checking: the error and group unfinished 
---let $slave_sql_errno= 1593
+let $slave_sql_errno= 1593; # ER_SLAVE_FATAL_ERROR
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 

=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test	2011-02-07 15:31:01 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2011-02-14 16:32:36 +0000
@@ -99,7 +99,7 @@ insert into t1 values (1) /* will not be
 connection slave;
 set @@global.debug='d,simulate_slave_unaware_checksum';
 start slave;
---let $slave_io_errno= 1236
+let $slave_io_errno= 1236; # ER_MASTER_FATAL_ERROR_READING_BINLOG
 --let $show_slave_io_error= 1
 source include/wait_for_slave_io_error.inc;
 
@@ -140,7 +140,7 @@ connection slave;
 # instruction to io thread
 set @@global.debug='d,simulate_checksum_test_failure';
 start slave io_thread;
---let $slave_io_errno= 1595
+let $slave_io_errno= 1595; # ER_SLAVE_RELAY_LOG_WRITE_FAILURE
 --let $show_slave_io_error= 1
 source include/wait_for_slave_io_error.inc;
 set @@global.debug='';
@@ -158,7 +158,7 @@ set @@global.slave_sql_verify_checksum =
 set @@global.debug='d,simulate_checksum_test_failure';
 
 start slave sql_thread;
---let $slave_sql_errno= 1593
+let $slave_sql_errno= 1593; # ER_SLAVE_FATAL_ERROR
 --let $show_slave_sql_error= 1
 source include/wait_for_slave_sql_error.inc;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_show_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_show_errors.test	2011-02-07 15:31:01 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_errors.test	2011-02-14 16:32:36 +0000
@@ -27,7 +27,7 @@ DROP TABLE t1;
 -- connection slave
 # action: now  wait for the slave to stop because it cannot
 #         remove a table that does not exist
--- let $slave_sql_errno=1051
+let $slave_sql_errno=1051; # ER_BAD_TABLE_ERROR
 -- source include/wait_for_slave_sql_error.inc
 
 --let $errts0= query_get_value("SHOW SLAVE STATUS", $field, 1)


Attachment: [text/bzr-bundle] bzr/luis.soares@oracle.com-20110214163236-pjqf0yrqmtl16a1l.bundle
Thread
bzr commit into mysql-trunk branch (luis.soares:3647) Bug#11765599Luis Soares14 Feb