From: Andrei Elkin Date: June 19 2011 1:11pm Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3307 to 3308) WL#5569 List-Archive: http://lists.mysql.com/commits/139472 Message-Id: <201106191311.p5JDBk0d006015@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0724374641==" --===============0724374641== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3307 Andrei Elkin 2011-06-19 wl#5569 MTS Fixing rpl.rpl_mixed_binlog_max_cache_size that revealed incorrect asynchronous handling of a Rotate event which does not split the current group and therefore has to be executed after all previously scheduled events. Fixing sensetivity of two other tests to mtr's invocation environment that includes inital values of slave_parallel_workers and slave_transaction_retries. @ mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc made test insensetive to the value of slave_transaction_retries in mtr env. @ mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result made test insensetive to the value of slave_parallel_workers in mtr env. @ mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result made test insensetive to the value of slave_transaction_retries in mtr env. @ mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test made test insensetive to the value of slave_parallel_workers in mtr env. @ sql/log_event.cc get_slave_worker() passes need_temps argument as FALSE is case of rows-events. Correcting the actual value of `mts_in_group' of mts_async_exec_by_coordinator(). modified: mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test sql/log_event.cc === 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 + --===============0724374641== 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: 3af0243daccb418fbd8230f6f3364668e3d27b9e # timestamp: 2011-06-19 16:11:46 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # wvrcwg503yhnhu1w # # Begin bundle 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 pCgmaBaYTD1/xdyRThQkO1Bd/AA= --===============0724374641==--