diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-22 11:26:28 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-22 11:26:28 +0100 |
| commit | a3f651d0f635df1a29d152c7088150b3ba144b72 (patch) | |
| tree | 66252c2b3443552793d623ace44b7385afcadfc3 /mysql-test | |
| parent | f1f9c4e4e580a7b060b0c9457afc2eaf7ad3e02d (diff) | |
| download | mariadb-git-a3f651d0f635df1a29d152c7088150b3ba144b72.tar.gz | |
MDEV-26: Global transaction ID.
Fix checksums for the new GTID events (reported by Pavel Ivanov).
Fix printing of GTID_LIST_EVENT.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_corruption.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_corruption.test | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_corruption.result b/mysql-test/suite/rpl/r/rpl_corruption.result index 62f56e70993..84328170dd2 100644 --- a/mysql-test/suite/rpl/r/rpl_corruption.result +++ b/mysql-test/suite/rpl/r/rpl_corruption.result @@ -17,16 +17,16 @@ SHOW BINLOG EVENTS; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; # 3. Master read a corrupted event from binlog and send the error to slave -SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2_set"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1236] -SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2_set"; # 4. Master read a corrupted event from binlog and send it to slave SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2_set"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1595,1913] -SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2_set"; SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum=1; # 5. Slave. Corruption in network diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test index c5625b4d002..45ca3805286 100644 --- a/mysql-test/suite/rpl/t/rpl_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_corruption.test @@ -100,19 +100,20 @@ let $wait_condition= SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE command = 'Binlog Dump'; --source include/wait_condition.inc -SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2_set"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1236; +--let $slave_timeout= 10 --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2_set"; # 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_dbug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2_set"; --connection slave START SLAVE IO_THREAD; # When the checksum error is detected, the slave sets error code 1913 @@ -122,7 +123,7 @@ START SLAVE IO_THREAD; let $slave_io_errno= 1595,1913; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2_set"; SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum=1; |