From: Andrei Elkin
Date: December 23 2010 2:01pm
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3262 to 3263) WL#5569
List-Archive: http://lists.mysql.com/commits/127558
Message-Id: <201012231401.oBNE1Fj7019428@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0763076005=="

--===============0763076005==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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
 3262 Andrei Elkin	2010-12-23
      wl#5569 MTS 
      
      Correcting an assert that is hit by few tests.
     @ sql/rpl_rli_pdb.cc
        Indeed, Coordinator can be awakened with abort_slave flag UP and not being killed.

    modified:
      sql/rpl_rli_pdb.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


--===============0763076005==
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: f048993606dffda07b08608c96132c354d2978c7
# timestamp: 2010-12-23 16:01:15 +0200
# base_revision_id: andrei.elkin@stripped\
#   a2h3vnxg6amijucx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV5gHzkAAa7/gAQQQgB4Y///
fq/fAL////RQA/pt7Nsc00tzp3cMlMmp6En6Sm81Kfpppkp+lPE1BoMxR4k/UGj1R6glEmIGUwaJ
oUP0Uaeo0eoNBkGgHqACSEEETam1TemppPSA0A0MEBkAAHMARgmIBgEwTRkNDAJgjEwlEmTU9U2a
JkEaZGh5IADQ0AAASx4v9tf5+/FbO3suxfYcMNqQcO15ywnIewKskQD4V4NrkRDdxHNbFDOoYkzp
KyFTeDdEPKT0TzpaIvH/XTRIWFB6x19uCnXmhyTvC3mBCPTkzFGH5svVhU6KCIcwRIy8VmoU4xEW
eUtnMtllTtESxEMo0tfWaPE8C72jFuaP8IkExgYRYhPJW79khNMnMJMwxBCo6+7E2uoK8tVM0oJn
UmMJgeX4FTXPEJiEJFdKoj0g69K0SKew0hRhIwszOfVt6hxGeGKlxLWWSSysQ4zEBCsQtztqc+Si
RxGzKXqERP2bnkkbMXK2tCkYJZkqBkG/oQW6aqjQSk2fEJ8qWfo2ZlVVKi1Or2ODCegiOJx8/3U6
6rVkuEG3cDA6ciGV5DCMQZIcRq0S1RNuEw/aaY3ugaqlsmSyBgWpMbqS0tNOgTlNP0EYprCNvCWw
1mdcETanFiScVxn1PbhrxKGFNxNO4zqOFY0fAn5rJxj5N2TbUI3QetOLCcYivWhxWE9C0dOXoPbZ
pH5TKQVbrNZYSL5m4UKDjyl3w31Nhv8lqEkXPzg3Mh8r/b2i7IvW+Tt4930H1y25CLh+lBgpUBYR
04RkjYI41AKG9qhhWk1DZgtM4rPrN200kioLvRFI1hj4OgqNOjrYIukRw27QZkHZT9yKcyCKCfwN
X73DHHlRCQwkO6ommMYHuzrcDDvGMOOAo4QmSB9Q62AFnCe2q7BZAVAHT08a6lJo0Z3kWVVBCk1X
9u67N67J73IJk6OCv5sLD48EQp1qoKfcvHPClYnSmgSX3W2OAgD5C3IHiqcfFYQWjMKhjVqUjRqn
GPZpncyUdazrEDxadOoh0qwllCW6wXg0FVhDE1LvJBKbeMRBgt3cXDvclRX900TFJjPiCOUI0v4Z
bzqgeltYf0XX8htI0xHIxwJgB6WEPYxgxoSyCbwwF96QxIntNPRCRrhdyngEbhNYp5XDrX3zbV5U
K2PYSonSG3PDB7nSJUkM0ejzFuC1MqMDKktcfhib0eAWgSQLDOhIQBsqGhRtXgiEmQ7A+vPQplQ0
XceEX5UrvaSmWd9YIbNpJKDxuPG7kBQi+MDQU18n2uU/JnTDptKsyn2mxlvO3GxbnUH1M1i1vFS/
pZnihJYIMTZfy6RjVmLp2WN1HG5iYeupkIjmwClBypRumxlMPymgSyN2WsnBZkWfMMCdKKcVg4W4
lBIEEgu2RUwWGf0dB/xdyRThQkF5gHzk


--===============0763076005==--