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

[Andrei Elkin]

 3261 Andrei Elkin	2010-12-23 [merge]
      wl#5569 MTS merging from the repo.

    added:
      mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt
    modified:
      mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result
      mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
      mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_sequential.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      sql/rpl_rli.cc
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-23 10:35:28 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 11:27:15 +0000
@@ -2848,7 +2848,7 @@ int apply_event_and_update_pos(Log_event
     int error= 0;
     if (skip_event || 
         (!rli->is_parallel_exec() ||
-         (!rli->curr_group_is_parallel || rli->curr_event_is_not_in_group)))
+         (!rli->curr_group_is_parallel)))
     {
       DBUG_ASSERT(skip_event || !rli->is_parallel_exec() ||
                   (!rli->curr_group_is_parallel ||
@@ -4349,7 +4349,7 @@ int slave_start_workers(Relay_log_info *
   rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level;
   rli->mts_total_groups= 0;
   rli->curr_group_seen_begin= FALSE; // initial presumtion, will change
-  rli->curr_group_is_parallel= TRUE; // initial presumtion, will change
+  rli->curr_group_is_parallel= FALSE; // initial presumtion, will change
   rli->curr_group_isolated= FALSE;
   rli->run_query_in_parallel= opt_mts_slave_run_query_in_parallel;
   rli->checkpoint_seqno= 0;


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