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

[Andrei Elkin]

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

 3308 Andrei Elkin	2011-06-19
      wl#5569 MTS
      
      fixing tests.
     @ mysql-test/extra/rpl_tests/rpl_extra_col_master.test
        MTS-supperssion is necessary because the test is supposed to stop slave due to an error.
     @ mysql-test/extra/rpl_tests/rpl_relayrotate.test
        Load decreasing to prove a warning was caused by slow environment
        so waiting to accept the killed status by SQL thread was
        ended by 1 min timeout.
     @ mysql-test/suite/rpl/r/rpl_relayrotate.result
        results updated.
     @ mysql-test/suite/rpl/t/rpl_stm_000001.test
        A macro is expanded in order to isolate which branch of two activities
        a suffered timeout failure belongs in.
     @ mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
        Fixing results of 64 version of the test that was editted in the prev push.

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_relayrotate.test
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-03-31 13:52:53 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2011-06-19 13:11:25 +0000
@@ -128,6 +128,7 @@ call mtr.add_suppression("Slave.*Can.t D
 call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
 call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
 call mtr.add_suppression("Slave SQL.*Column 2 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");
 --enable_query_log
 
 sync_slave_with_master;

=== modified file 'mysql-test/extra/rpl_tests/rpl_relayrotate.test'
--- a/mysql-test/extra/rpl_tests/rpl_relayrotate.test	2007-06-18 13:36:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_relayrotate.test	2011-06-19 13:11:25 +0000
@@ -18,7 +18,8 @@ connection master;
 --disable_warnings
 eval create table t1 (a int) engine=$engine_type;
 --enable_warnings
-let $1=8000;
+let $loop_max= 4000;
+let $1=$loop_max;
 disable_query_log;
 begin;
 while ($1)
@@ -50,12 +51,13 @@ stop slave;
 # and the table is now empty.
 # Now restart
 start slave;
-# And see if the table contains '8000'
+# And see if the table contains $loop_max
 # which proves that the transaction restarted at
 # the right place.
 # We must wait for the transaction to commit before
 # reading, with a sync_with_master.
 sync_with_master;
+--replace_result $loop_max loop_max
 select max(a) from t1;
 connection master;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_relayrotate.result'
--- a/mysql-test/suite/rpl/r/rpl_relayrotate.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relayrotate.result	2011-06-19 13:11:25 +0000
@@ -8,6 +8,6 @@ stop slave;
 start slave;
 select max(a) from t1;
 max(a)
-8000
+loop_max
 drop table t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-03-18 14:58:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-06-19 13:11:25 +0000
@@ -50,7 +50,9 @@ select (@id := id) - id from t2;
 kill @id;
 drop table t2;
 Got one of the listed errors
-include/wait_for_slave_sql_error_and_skip.inc [errno=1053]
+include/wait_for_slave_sql_error.inc [errno=1053]
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
+include/start_slave.inc
 select count(*) from t1;
 count(*)
 100

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_000001.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_000001.test	2011-02-22 07:52:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_000001.test	2011-06-19 13:11:25 +0000
@@ -109,7 +109,10 @@ connection slave;
 # the master (so it has a non-zero error code in the binlog).
 # 1053 = ER_SERVER_SHUTDOWN
 --let $slave_sql_errno= 1053
---source include/wait_for_slave_sql_error_and_skip.inc
+###--source include/wait_for_slave_sql_error_and_skip.inc
+--source include/wait_for_slave_sql_error.inc
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
+source include/start_slave.inc;
 
 select count(*) from t1;
 connection master1;

=== modified file 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	2011-06-19 13:11:25 +0000
@@ -1,7 +1,4 @@
 SET @start_global_value = @@global.slave_transaction_retries;
-SELECT @start_global_value;
-@start_global_value
-10
 '#--------------------FN_DYNVARS_149_01-------------------------#'
 SET @@global.slave_transaction_retries = 50;
 SET @@global.slave_transaction_retries = DEFAULT;
@@ -111,6 +108,4 @@ SELECT @@slave_transaction_retries;
 3600
 SET global slave_transaction_retries = 99;
 SET @@global.slave_transaction_retries = @start_global_value;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
+


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