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

[Andrei Elkin]

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

 3263 Andrei Elkin	2010-12-23
      wl#5569 MTS:
      
      refining another assert that can force C to delete events that are skipped with the slave skip counter

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-23 11:27:15 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 14:00:28 +0000
@@ -3059,13 +3059,15 @@ static int exec_relay_log_event(THD* thd
            !rli->curr_group_is_parallel || rli->curr_event_is_not_in_group)
           && ev->get_type_code() != FORMAT_DESCRIPTION_EVENT)
       {
-        DBUG_ASSERT(!rli->is_parallel_exec() ||
+        DBUG_ASSERT(!rli->is_parallel_exec() 
+                    ||
                     (ev->only_sequential_exec(rli->run_query_in_parallel,
                                               // rli->curr_group_is_parallel
                                               (rli->curr_group_seen_begin ||
                                                rli->last_assigned_worker != NULL))
                      && (!rli->curr_group_seen_begin ||
-                         ev->parallel_exec_by_coordinator(::server_id))));
+                         ev->parallel_exec_by_coordinator(::server_id)))
+                    || (ev->shall_skip(rli) != Log_event::EVENT_SKIP_NOT));
       /* MTS:  Observation/todo.
 
          ROWS_QUERY_LOG_EVENT could be supported easier if


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