List:Commits« Previous MessageNext Message »
From:He Zhenxing Date:December 21 2010 7:49am
Subject:bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3447) Bug#59079
View as plain text  
#At file:///media/sdb2/hezx/work/mysql/bzr/test/trunk-bugfixing/ based on revid:vasil.dimov@stripped

 3447 He Zhenxing	2010-12-21
      BUG#59079 rpl_binlog_errors.test fails when enables binlog-checksum
      
      The test case dependent on the size of incident event to calculate
      the event offset, howerver, the size of Incident_log_event is different when binlog-checksum
      is enabled, and caused the test case to fail.
      
      Fixed the problem by checking if binlog-checksum is enabled or not
      and use different size accordingly.

    modified:
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test	2010-12-17 01:17:03 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test	2010-12-21 07:49:06 +0000
@@ -189,9 +189,10 @@ SET GLOBAL debug="-d,error_unique_log_fi
 -- let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1)
 -- let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
 
-# 53 is the size of the incident event, so we start from 22 bytes before the
-# current position
--- let $binlog_start = `SELECT $binlog_start - 53`
+# 53 (57 if binlog-checksum enabled) is the size of the incident
+# event, so we start from 53/57 bytes before the current position
+-- let $incident_size= `SELECT IF(@@binlog_checksum = 'CRC32', 57, 53)`
+-- let $binlog_start = `SELECT $binlog_start - $incident_size`
 FLUSH LOGS;
 -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start> $binlog_file BINLOG_FILE
 -- replace_column 2 # 4 # 5 #


Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20101221074906-bymix6tpw03i907n.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3447) Bug#59079He Zhenxing21 Dec
  • Re: bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3447)Bug#59079Libing Song22 Dec
    • Re: bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3447)Bug#59079He Zhenxing22 Dec
  • Re: bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3447)Bug#59079Libing Song22 Dec