From: Andrei Elkin Date: June 19 2011 4:15pm Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3308 to 3309) WL#5569 List-Archive: http://lists.mysql.com/commits/139475 Message-Id: <201106191615.p5JGFHKH007379@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0799430611==" --===============0799430611== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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; - --===============0799430611== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 4c96c0aec40986aa39ce936ca818d8db99d36843 # timestamp: 2011-06-19 19:15:17 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # ofb98t7pqoi8047r # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXEObHAAAWPfgAAQWGP/93IC DAC/7//wUAMmeWypUehCSSZNFPJ6U2amibUwT1QZpoZI0YxoaGgAyGgAAAAAkip4kMKYDFAMABDQ wG1RHopkAAaAAAAACShGE0NJim0TFP1NJ6TTRieo0PSzE6cye+eN5fdRYlg02jQ50bs62ZunM7Pp aLmdCFnn0/3O3sy9mLJy0y1bM05kNtj7HeaPgRRO0q+Mwwq2q4CdIrSLhVPNG/ZFDXxPY+JT4XES 15YEJnBxoiGTSWWp2UYKbWMQjCkVCHrocRh8i15XRFIaSt/pEH0xutxCYvdSNgutrxazuPPfEQ4Z ZQy6lcckKC5uMi63cr65Buo0IWPoPLXoisk0V8izuOIsSmVJPeUouWZnE0YBbAkU2siQvN2NtqI1 kmRfKY92Ela7EkJ4h+lU9Si/ucRgW2tKS3KU6SSaRlGKfYbu7lqGYSVszkFTgkXl90b7qwwjNkIC JN0Mn0qNgWjDaRH1is3YNJ3IuvjUx9jSA1MpZ5UFMWhr/BPQ/jJUY884JE4FbDHu6w69fA+Su6KG g7nUVA0NuDCHbMb59EiwJaNcEF4cFffXmG01jO6vDOSOBtXFLlA4Q5TOXoGZ+TZX4Zd1/ks9G6F2 RlvhSf3dTJmSPRI0ODVLjdGpPTXSxOQqVXPAtxFkTBQ/XDkMBeIm6E2mHs7eWmw+/Es8Nc2dG0tD /Bo8rbbFi00te4FqsjxbZ2ccEiJJMtWEt+WSxIhUmBSCqqXANCB019GSacxuSN/iJmAbxPeshSO5 C2FAxkMh7eSY4fIxTTD3ALe2K+M9ldAkG0NLauW0YCxDMO3ZugOgD3A0PFcJJDCGPWCRhxU7EAVA +3MrLMhmWF0Ew4E4VDSJfngpYSic4LUOYmLOVYZBMWAJ4GrzskbgkvBqulTBjE0dXj+Qr0qDHrHJ SSXraHAmHMFJHQqLu/AnVImuImupXWDCr6hsdYu+NxuBsVTrmU+Jkw9BNGz1p5eoVOcbGV3zGvx5 WGoSCxYhcNexZZPFyYppMOIhPdpSJPJiwY41xkRUf4u5IpwoSDiHNjgA --===============0799430611==--