bzr push into mysql-trunk-wl5597 branch (rohit.kalhans:3682 to 3683) WL#5597

[Rohit Kalhans]

 3683 Rohit Kalhans	2012-04-25
      WL#5597: fixing warnings in rpl.rpl_row_hash_scan when run with MTS.

    modified:
      mysql-test/suite/rpl/r/rpl_row_hash_scan.result
      mysql-test/suite/rpl/t/rpl_row_hash_scan.test
 3682 Rohit Kalhans	2012-04-25
      WL#5597: Adding new run for testing feature with MTS 

    modified:
      mysql-test/collections/mysql-trunk-wl5597.push
=== modified file 'mysql-test/suite/rpl/r/rpl_row_hash_scan.result'
--- a/mysql-test/suite/rpl/r/rpl_row_hash_scan.result	2012-04-16 16:57:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_hash_scan.result	2012-04-25 11:18:57 +0000
@@ -6,6 +6,10 @@ Note	####	Storing MySQL user name or pas
 call mtr.add_suppression("Slave SQL: Could not execute Update_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log master-bin.[0-9]*, end_log_pos [0-9]*, Error_code: 1032");
 call mtr.add_suppression("Slave: Can't find record in 't1' Error_code: 1032");
 call mtr.add_suppression("Slave SQL: Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log master-bin.[0-9]*, end_log_pos [0-9]*, Error_code: 1032");
+call mtr.add_suppression("Slave SQL: ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state. A restart should restore consistency automatically, although using non-transactional storage for data or info tables or DDL queries could lead to problems. In such cases you have to examine your data (see documentation for details). Error_code: 1756");
+Warnings:
+Warning	1265	Data truncated for column 'pattern' at row 1
+call mtr.add_suppression("Slave SQL: Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log FIRST, end_log_pos [0-9]*, Error_code: 1032");
 SET @saved_slave_rows_search_algorithms= @@global.slave_rows_search_algorithms;
 SET GLOBAL slave_rows_search_algorithms= 'INDEX_SCAN,HASH_SCAN';
 CREATE TABLE t1 (a INT);

=== modified file 'mysql-test/suite/rpl/t/rpl_row_hash_scan.test'
--- a/mysql-test/suite/rpl/t/rpl_row_hash_scan.test	2012-04-03 13:01:53 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_hash_scan.test	2012-04-25 11:18:57 +0000
@@ -30,6 +30,8 @@
 call mtr.add_suppression("Slave SQL: Could not execute Update_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log master-bin.[0-9]*, end_log_pos [0-9]*, Error_code: 1032");
 call mtr.add_suppression("Slave: Can't find record in 't1' Error_code: 1032");
 call mtr.add_suppression("Slave SQL: Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log master-bin.[0-9]*, end_log_pos [0-9]*, Error_code: 1032");
+call mtr.add_suppression("Slave SQL: ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state. A restart should restore consistency automatically, although using non-transactional storage for data or info tables or DDL queries could lead to problems. In such cases you have to examine your data (see documentation for details). Error_code: 1756");
+call mtr.add_suppression("Slave SQL: Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_END_OF_FILE; the event's master log FIRST, end_log_pos [0-9]*, Error_code: 1032");
 
 --connection slave
 SET @saved_slave_rows_search_algorithms= @@global.slave_rows_search_algorithms;

No bundle (reason: useless for push emails).