bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3310) WL#5569

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3310 Andrei Elkin	2011-06-20
      wl#5569 MTS
      
      fixing tests.
      Adding suppressions to few tests that produce sql thread error. Experimenting with rpl_relayrotate to descrease number of rotations and thus to make it clear if timeout is not due to computational load.

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
      mysql-test/extra/rpl_tests/rpl_relayrotate.test
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
      mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/t/rpl_row_colSize.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2011-04-27 09:04:59 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2011-06-19 22:39:48 +0000
@@ -15,6 +15,7 @@
 
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 --echo **** Diff Table Def Start ****
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_relayrotate.test'
--- a/mysql-test/extra/rpl_tests/rpl_relayrotate.test	2011-06-19 13:11:25 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_relayrotate.test	2011-06-19 22:39:48 +0000
@@ -18,7 +18,7 @@ connection master;
 --disable_warnings
 eval create table t1 (a int) engine=$engine_type;
 --enable_warnings
-let $loop_max= 4000;
+let $loop_max= 2000;
 let $1=$loop_max;
 disable_query_log;
 begin;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_tabledefs.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2011-02-23 20:01:27 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2011-06-19 22:39:48 +0000
@@ -149,6 +149,8 @@ INSERT INTO t4 VALUES (4);
 connection slave;
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+
 --let $slave_skip_counter= 2
 --let $slave_sql_errno= 1677
 --let $show_slave_sql_error= 1

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2011-06-19 22:39:48 +0000
@@ -2,6 +2,7 @@ include/master-slave.inc
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2011-06-19 22:39:48 +0000
@@ -2,6 +2,7 @@ include/master-slave.inc
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result	2011-06-19 22:39:48 +0000
@@ -267,6 +267,7 @@ RESET MASTER;
 START SLAVE;
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 *** Cleanup  ***
 DROP TABLE IF EXISTS t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2011-06-19 22:39:48 +0000
@@ -119,6 +119,7 @@ INSERT INTO t9 VALUES (4);
 INSERT INTO t4 VALUES (4);
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
 Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
 INSERT INTO t9 VALUES (5);

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2011-06-19 22:39:48 +0000
@@ -119,6 +119,7 @@ INSERT INTO t9 VALUES (4);
 INSERT INTO t4 VALUES (4);
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
 Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
 INSERT INTO t9 VALUES (5);

=== modified file 'mysql-test/suite/rpl/t/rpl_row_colSize.test'
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test	2011-02-23 11:54:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test	2011-06-19 22:39:48 +0000
@@ -163,6 +163,7 @@ source include/test_fieldsize.inc;
 connection slave;
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 --echo *** Cleanup  ***
 connection master;


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