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

[Andrei Elkin]

 3309 Andrei Elkin	2011-06-19
      wl#5569 MTS
      
      fixing slave_transaction_retries_basic_64.result

    modified:
      mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
 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/suite/sys_vars/r/slave_transaction_retries_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	2011-06-19 13:11:25 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	2011-06-19 16:14:50 +0000
@@ -108,4 +108,3 @@ SELECT @@slave_transaction_retries;
 3600
 SET global slave_transaction_retries = 99;
 SET @@global.slave_transaction_retries = @start_global_value;
-


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