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

[Andrei Elkin]

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

 3260 Andrei Elkin	2010-12-23
      wl#5569 MTS
      
      fixing failing tests.
     @ sql/rpl_slave.cc
        fixing an issue where a Rotate event could appear in between of events of a group.
        That case should not force any rli->flush_info() but rather normal relay log coordinates incr.

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-22 18:34:26 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 11:25:31 +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 ||
@@ -4348,7 +4348,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]