bzr commit into mysql-next-mr-bugfixing branch (Dao-Gang.Qu:3265) Bug#56913

[Dao-Gang.Qu]

#At file:///home/daogangqu/mysql/bzrwork1/pushwl5404/mysql-next-mr-bugfixing/ based on revid:dao-gang.qu@stripped

 3265 Dao-Gang.Qu@stripped	2010-09-30
      Bug #56913    rpl_row_ignorable_event fails sporadically on next-mr-bugfixing codebase
      
      In RBR, every value is inserted into a queue for multi 'INSERT DELAYED ...'
      stmt by one thread. Then these values will be taken out and inserted
      into table in one execution series or in separate execution series by
      another thread parallelly. Values in one execution series will be
      binlogged into one rows event with its table map event, values in
      separate execution series will be binlogged into separate rows event
      with its table map event. So the binlog of multi 'INSERT DELAYED ...'
      stmt is unstable.
      
      To fix the problom to just test single 'INSERT DELAYED ...' stmt
      in the test.
     @ mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
        Updated for the patch of Bug#56913.
     @ mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
        Update to test single 'INSERT DELAYED ...' stmt as the binlog
        of multi 'INSERT DELAYED ...' stmt is unstable.

    modified:
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
=== modified file 'mysql-test/suite/rpl/r/rpl_row_ignorable_event.result'
--- a/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2010-09-01 02:51:08 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2010-09-30 04:23:43 +0000
@@ -41,7 +41,7 @@ insert into t5(a, b) values(3,1);
 # out all its related tables by replication filtering rules
 update t4,t5 set t4.a=4, t5.a=5 where t4.b=t5.b;
 # Test insert delayed ...
-insert delayed into t3(a,b) values(1,5),(1,6),(1,7);
+insert delayed into t3(a,b) values(1,5);
 # Test load data infile
 create table t6(a VARCHAR(60)) engine= myisam;
 load data infile '../../std_data/words.dat' into table t6;
@@ -129,7 +129,7 @@ master-bin.000001	#	Table_map	#	#	table_
 master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Rows_query	#	#	# insert delayed into t3(a,b) values(1,5),(1,6),(1,7)
+master-bin.000001	#	Rows_query	#	#	# insert delayed into t3(a,b) values(1,5)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
@@ -517,7 +517,7 @@ BEGIN
 /*!*/;
 # at #
 #server id #  end_log_pos # 	Rows_query
-# insert delayed into t3(a,b) values(1,5),(1,6),(1,7)
+# insert delayed into t3(a,b) values(1,5)
 # at #
 # at #
 #server id #  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
@@ -526,14 +526,6 @@ BEGIN
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
-### SET
-###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
-###   @2=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
-### SET
-###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
-###   @2=7 /* INT meta=0 nullable=1 is_null=0 */
 # at #
 #server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=#
 SET TIMESTAMP=t/*!*/;
@@ -931,7 +923,7 @@ slave-bin.000001	#	Table_map	#	#	table_i
 slave-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Rows_query	#	#	# insert delayed into t3(a,b) values(1,5),(1,6),(1,7)
+slave-bin.000001	#	Rows_query	#	#	# insert delayed into t3(a,b) values(1,5)
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT

=== modified file 'mysql-test/suite/rpl/t/rpl_row_ignorable_event.test'
--- a/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2010-08-06 02:20:44 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2010-09-30 04:23:43 +0000
@@ -58,7 +58,11 @@ insert into t5(a, b) values(3,1);
 update t4,t5 set t4.a=4, t5.a=5 where t4.b=t5.b;
 
 --echo # Test insert delayed ...
-insert delayed into t3(a,b) values(1,5),(1,6),(1,7);
+let $table=t3;
+let $count=1;
+insert delayed into t3(a,b) values(1,5);
+inc $count;
+--source include/wait_until_rows_count.inc
 
 --echo # Test load data infile
 create table t6(a VARCHAR(60)) engine= myisam;


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