bzr push into mysql-trunk branch (nuno.carvalho:3851 to 3852) Bug#13680651

[Nuno Carvalho]

 3852 Nuno Carvalho	2012-04-09
      BUG#13680651: RPL_CORRUPTION TEST FAILS WITH SLAVE STOPPED WITH WRONG ERROR CODE ON VALGRIND
      
      Errors numbers shifted and include/wait_for_slave_io_error.inc does not
      supports error names, so changed 1721 to new
      ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE number (1741).

    modified:
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/t/rpl_corruption.test
 3851 Mayank Prasad	2012-04-07 [merge]
      BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLD
            
      Merge : 5.5->trunk

    modified:
      libmysqld/lib_sql.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_corruption.result	2012-03-23 20:11:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_corruption.result	2012-04-09 11:08:46 +0000
@@ -26,13 +26,13 @@ include/wait_for_slave_io_error.inc [err
 SET GLOBAL master_verify_checksum=0;
 SET GLOBAL debug="d,corrupt_read_log_event";
 START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595,1721]
+include/wait_for_slave_io_error.inc [errno=1595,1741]
 SET GLOBAL debug="";
 SET GLOBAL master_verify_checksum=1;
 # 5. Slave. Corruption in network
 SET GLOBAL debug="d,corrupt_queue_event";
 START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595,1721]
+include/wait_for_slave_io_error.inc [errno=1595,1741]
 # 6. Slave. Corruption in relay log
 SET GLOBAL debug="d,corrupt_read_log_event_char";
 START SLAVE SQL_THREAD;

=== modified file 'mysql-test/suite/rpl/t/rpl_corruption.test'
--- a/mysql-test/suite/rpl/t/rpl_corruption.test	2012-03-06 22:52:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_corruption.test	2012-04-09 11:08:46 +0000
@@ -80,7 +80,7 @@ reap;
 SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
-let $slave_io_errno= 1236;
+let $slave_io_errno= 1236; # ER_MASTER_FATAL_ERROR_READING_BINLOG
 --source include/wait_for_slave_io_error.inc
 --connection master
 
@@ -91,7 +91,7 @@ SET GLOBAL master_verify_checksum=0;
 SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
-let $slave_io_errno= 1595,1721;
+let $slave_io_errno= 1595,1741; # ER_SLAVE_RELAY_LOG_WRITE_FAILURE, ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 --source include/wait_for_slave_io_error.inc
 --connection master
 SET GLOBAL debug="";
@@ -102,14 +102,14 @@ SET GLOBAL master_verify_checksum=1;
 --connection slave
 SET GLOBAL debug="d,corrupt_queue_event";
 START SLAVE IO_THREAD;
-let $slave_io_errno= 1595,1721;
+let $slave_io_errno= 1595,1741; # ER_SLAVE_RELAY_LOG_WRITE_FAILURE, ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 --source include/wait_for_slave_io_error.inc
 
 # Emulate corruption in relay log
 --echo # 6. Slave. Corruption in relay log
 SET GLOBAL debug="d,corrupt_read_log_event_char";
 START SLAVE SQL_THREAD;
-let $slave_sql_errno= 1593;
+let $slave_sql_errno= 1593; # ER_SLAVE_FATAL_ERROR
 --source include/wait_for_slave_sql_error.inc
 
 # Start normal replication and compare same table on master

No bundle (reason: useless for push emails).