From: Andrei Elkin Date: June 19 2011 9:35am Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3306 to 3307) WL#5569 List-Archive: http://lists.mysql.com/commits/139467 Message-Id: <201106190935.p5J9ZRLk001445@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1916226923==" --===============1916226923== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3306 Alfranio Correia 2011-06-19 Fixed some windows failures. modified: sql/rpl_slave.cc === modified file 'mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc' --- a/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc 2009-12-22 09:35:56 +0000 +++ b/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc 2011-06-19 09:33:36 +0000 @@ -36,7 +36,6 @@ ############################################################# SET @start_global_value = @@global.slave_transaction_retries; -SELECT @start_global_value; --echo '#--------------------FN_DYNVARS_149_01-------------------------#' ################################################################### @@ -179,7 +178,6 @@ SET global slave_transaction_retries = 9 #################################### SET @@global.slave_transaction_retries = @start_global_value; -SELECT @@global.slave_transaction_retries; ######################################################## # END OF slave_transaction_retries TESTS # === modified file 'mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result' --- a/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result 2011-06-17 15:34:16 +0000 +++ b/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result 2011-06-19 09:33:36 +0000 @@ -1,16 +1,10 @@ set @save.slave_parallel_workers= @@global.slave_parallel_workers; select @@session.slave_parallel_workers; ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable -show global variables like 'slave_parallel_workers'; -Variable_name Value -slave_parallel_workers 0 -show session variables like 'slave_parallel_workers'; -Variable_name Value -slave_parallel_workers 0 -select * from information_schema.global_variables where variable_name='$var'; -VARIABLE_NAME VARIABLE_VALUE -select * from information_schema.session_variables where variable_name='$var'; -VARIABLE_NAME VARIABLE_VALUE +select variable_name from information_schema.global_variables where variable_name='$var'; +variable_name +select variable_name from information_schema.session_variables where variable_name='$var'; +variable_name set @@global.slave_parallel_workers= 0; select @@global.slave_parallel_workers; @@global.slave_parallel_workers === modified file 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result' --- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result 2009-12-22 09:35:56 +0000 +++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result 2011-06-19 09:33:36 +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; @@ -115,6 +112,3 @@ 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 === modified file 'mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test' --- a/mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test 2011-06-16 08:29:53 +0000 +++ b/mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test 2011-06-19 09:33:36 +0000 @@ -9,10 +9,8 @@ eval set @save.$var= @@global.$var; --error ER_INCORRECT_GLOBAL_LOCAL_VAR eval select @@session.$var; -eval show global variables like '$var'; -eval show session variables like '$var'; -select * from information_schema.global_variables where variable_name='$var'; -select * from information_schema.session_variables where variable_name='$var'; +select variable_name from information_schema.global_variables where variable_name='$var'; +select variable_name from information_schema.session_variables where variable_name='$var'; # # show that it's writable === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2011-06-18 18:58:21 +0000 +++ b/sql/log_event.cc 2011-06-19 09:33:36 +0000 @@ -2496,7 +2496,8 @@ Slave_worker *Log_event::get_slave_worke if (!(ret_worker= get_slave_worker(*ref_cur_db, rli, &mts_assigned_partitions[i], - TRUE, ret_worker))) + // only rows-events do not need temporary tables + get_type_code() != TABLE_MAP_EVENT, ret_worker))) { llstr(rli->get_event_relay_log_pos(), llbuff); rli->report(ERROR_LEVEL, ER_MTS_CANT_PARALLEL, @@ -2881,7 +2882,7 @@ int Log_event::apply_event(Relay_log_inf if (!(parallel= rli->is_parallel_exec()) || (async_event= mts_async_exec_by_coordinator(::server_id, - rli->mts_group_status != Relay_log_info::MTS_NOT_IN_GROUP)) || + rli->mts_group_status == Relay_log_info::MTS_IN_GROUP)) || (seq_event= mts_sequential_exec())) { if (parallel) --===============1916226923== 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: 0fab00849747af4bdcbc2bebdceb54890091b163 # timestamp: 2011-06-19 12:35:27 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: alfranio.correia@stripped\ # 0bx0k5qjn78ps8n6 # # Begin bundle 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 --===============1916226923==--