bzr commit into mysql-trunk-bugfixing branch (zhenxing.he:3467) Bug#59079

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzr/test/trunk-bugfixing/ based on revid:alfranio.correia@stripped

 3467 He Zhenxing	2010-12-22
      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 use the event sequence number instead event
      log file position to locate the incident event.

    modified:
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result	2010-12-22 09:17:12 +0000
@@ -98,10 +98,9 @@ count(*)
 1
 ### check that the incident event is written to the current log
 SET GLOBAL debug="-d,error_unique_log_filename";
-FLUSH LOGS;
-SHOW BINLOG EVENTS IN 'BINLOG_FILE' FROM <binlog_start> LIMIT 1;
+show binlog events from <binlog_start> limit 4,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-BINLOG_FILE	#	Incident	#	#	#1 (LOST_EVENTS)
+master-bin.000001	#	Incident	#	#	#1 (LOST_EVENTS)
 DELETE FROM t4;
 RESET MASTER;
 ###################### TEST #8

=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test	2010-12-22 09:17:12 +0000
@@ -186,16 +186,8 @@ SELECT count(*) FROM t4;
 
 -- echo ### check that the incident event is written to the current log
 SET GLOBAL debug="-d,error_unique_log_filename";
--- 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`
-FLUSH LOGS;
--- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start> $binlog_file BINLOG_FILE
--- replace_column 2 # 4 # 5 #
--- eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $binlog_start LIMIT 1
+-- let $binlog_limit= 4,1
+-- source include/show_binlog_events.inc
 
 # clean up and move to next test
 DELETE FROM t4;


Attachment: [text/bzr-bundle] bzr/[e-mail]