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

[Andrei Elkin]

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

 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/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)


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