From: Andrei Elkin Date: March 13 2011 7:56pm Subject: bzr commit into mysql-trunk branch (andrei.elkin:3757) Bug#58754 Bug#11765758 List-Archive: http://lists.mysql.com/commits/132874 X-Bug: 58754,11765758 Message-Id: <201103131956.p2DJunZ5001955@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1262841647==" --===============1262841647== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ based on revid:mayank.prasad@stripped 3757 Andrei Elkin 2011-03-13 Bug#11765758 bug#58754 RPL_CORRUPTION FAILED on mysql-trunk Simplifying the test further to use only unsigned "d" debug instructions. As in a previous commit logics don't suffer. The idea is to observe PB2 execution of the new version of the test on win-64. @ mysql-test/suite/rpl/r/rpl_corruption.result results got updated. @ mysql-test/suite/rpl/t/rpl_corruption.test replacing +|-d all around the tests. modified: mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/t/rpl_corruption.test === modified file 'mysql-test/suite/rpl/r/rpl_corruption.result' --- a/mysql-test/suite/rpl/r/rpl_corruption.result 2011-03-11 09:35:38 +0000 +++ b/mysql-test/suite/rpl/r/rpl_corruption.result 2011-03-13 19:56:40 +0000 @@ -12,27 +12,27 @@ SET @old_master_verify_checksum = @@mast CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10), c VARCHAR(100)); include/stop_slave.inc # 2. Corruption in master binlog and SHOW BINLOG EVENTS -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug="d,corrupt_read_log_event_char"; SHOW BINLOG EVENTS; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error -SET GLOBAL debug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug=""; # 3. Master read a corrupted event from binlog and send the error to slave -SET GLOBAL debug="+d,corrupt_read_log_event"; +SET GLOBAL debug="d,corrupt_read_log_event"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1236] -SET GLOBAL debug="-d,corrupt_read_log_event"; +SET GLOBAL debug=""; # 4. Master read a corrupted event from binlog and send it to slave SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug="+d,corrupt_read_log_event"; +SET GLOBAL debug="d,corrupt_read_log_event"; START SLAVE IO_THREAD; -include/wait_for_slave_io_error.inc [errno=1595] -SET GLOBAL debug="-d,corrupt_read_log_event"; +include/wait_for_slave_io_error.inc [errno=1595,1722] +SET GLOBAL debug=""; SET GLOBAL master_verify_checksum=1; # 5. Slave. Corruption in network -SET GLOBAL debug="+d,corrupt_queue_event"; +SET GLOBAL debug="d,corrupt_queue_event"; START SLAVE IO_THREAD; -include/wait_for_slave_io_error.inc [errno=1595] -SET GLOBAL debug="-d,corrupt_queue_event"; +include/wait_for_slave_io_error.inc [errno=1595,1722] +SET GLOBAL debug=""; # 6. Slave. Corruption in relay log SET GLOBAL debug="d,corrupt_read_log_event_char"; START SLAVE; === modified file 'mysql-test/suite/rpl/t/rpl_corruption.test' --- a/mysql-test/suite/rpl/t/rpl_corruption.test 2011-03-11 09:35:38 +0000 +++ b/mysql-test/suite/rpl/t/rpl_corruption.test 2011-03-13 19:56:40 +0000 @@ -56,62 +56,66 @@ while ($i) { } --enable_query_log +# +# Bug #58630 shows `+d' syntax has a side effect Andrei changed it to +# unsigned `d' version which does not affect the tests logics. +# todo: +# restore *all* following `SET GLOBAL debug' back to `+|-d' when Bug +# #58630, OBug#11765758 sorted out +# + # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing --echo # 2. Corruption in master binlog and SHOW BINLOG EVENTS -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug="d,corrupt_read_log_event_char"; --echo SHOW BINLOG EVENTS; --disable_query_log send_eval SHOW BINLOG EVENTS FROM $pos; --enable_query_log --error ER_ERROR_WHEN_EXECUTING_COMMAND reap; -SET GLOBAL debug="-d,corrupt_read_log_event_char"; + +# see above comments on `+d' syntax +SET GLOBAL debug=""; # Emulate corruption on master with crc checking on master --echo # 3. Master read a corrupted event from binlog and send the error to slave -SET GLOBAL debug="+d,corrupt_read_log_event"; +SET GLOBAL debug="d,corrupt_read_log_event"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1236; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event"; +SET GLOBAL debug=""; # Emulate corruption on master without crc checking on master --echo # 4. Master read a corrupted event from binlog and send it to slave --connection master SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug="+d,corrupt_read_log_event"; +SET GLOBAL debug="d,corrupt_read_log_event"; --connection slave START SLAVE IO_THREAD; -let $slave_io_errno= 1595; +let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event"; +SET GLOBAL debug=""; SET GLOBAL master_verify_checksum=1; # Emulate corruption in network --echo # 5. Slave. Corruption in network --connection slave -SET GLOBAL debug="+d,corrupt_queue_event"; +SET GLOBAL debug="d,corrupt_queue_event"; START SLAVE IO_THREAD; -let $slave_io_errno= 1595; +let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc -SET GLOBAL debug="-d,corrupt_queue_event"; +SET GLOBAL debug=""; # Emulate corruption in relay log --echo # 6. Slave. Corruption in relay log -# -# Bug #58630 shows `+d' syntax has a side effect -# Andrei changed it to unsigned `d' version which does not affect the tests logics. -# todo: restore back to `+d' when Bug #58630, OBug#11765758 sorted out -# SET GLOBAL debug="d,corrupt_read_log_event_char"; START SLAVE; let $slave_sql_errno= 1593; --source include/wait_for_slave_sql_error.inc -# see above comments on `+d' syntax SET GLOBAL debug=""; --===============1262841647== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # testament_sha1: 9e5e3169c848db8d6b7d1129abb6cc8cb26f7b32 # timestamp: 2011-03-13 21:56:49 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-\ # bugfixing/ # base_revision_id: mayank.prasad@stripped\ # 5cagraeoyr2duhgm # # Begin bundle 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 --===============1262841647==--