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

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

 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
 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_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2010-12-22 15:01:47 +0000
+++ b/sql/rpl_rli_pdb.cc	2010-12-23 13:34:02 +0000
@@ -902,7 +902,7 @@ int wait_for_workers_to_finish(Relay_log
       thd->exit_cond(proc_info);
       ret++;
 
-      DBUG_ASSERT(entry->usage == 0 || thd->killed);
+      DBUG_ASSERT(entry->usage == 0 || thd->killed || rli->abort_slave);
     }
     else
     {


--===============1239864538==
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: cd3b7aacccc03eeb356e3c1debb16fe8e940472a
# timestamp: 2010-12-23 15:34:33 +0200
# base_revision_id: andrei.elkin@stripped\
#   nyke1ibzar33gr98
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWevtQ+oAAZdfgFAQWGf//36i
XgC////0UAPOvOhd2uKAAaIibSeiGDSnsUnqPUGjQ9QBiD1PUeoGUhqh6ep6k/VPepMQPVMhtAAA
BAyDmmJgI0wIwjAAAAEwjAap4qeCjTJpoAAAAAAAAEkkyZDQTTTSTwTRknlQ8JD01Bo0aekvgEzh
Zv/BRY1FBhMzdJAQoXZA1qEaeswldPe4wZ28PUvCmQwGaBCXSrtn7+BaGMJ8d/kgdD881unI03v3
0wtFCKGlk8HImskGQw3uuqk/ijLEEFa5c1d4LlJ1Uhx67SVG03sn9UWJHS8Rqvsh2XwS+Da05aSY
k5I0eAqrn7cGGRBReqBmbzsE3B6F8vW8zry62MvrCmoRAKncIaMqgYwELR5ftV5SUirNK5Mlp75k
ChGinTwzA95QWo4hdciYhkEB2y6hbDbXSGhg+ya8Xcruq56lPbggk7vrFNYCa6Jxt41xWGrYK9Vk
BTDjPAoCssTh/a48dpYYe8bVFLdQvXk8ZWPJlb3CtpphrvVpVcfdalYYjFtkmN/kKuXxvt0jQXfz
26ITuqcnsYlG1u5mT4ekAiv1LcTFhionUBphDK9DaxQrCMn96bpqMdWVAJI3Bk2ATIpLgGqQRvsJ
pICCgbyGtRoDcATCVrjtDPloL7J0mImbnbDDFAhk3PoMjH1hInhD7QZKQiL0hwyy51fq9R8SgMRG
2kjWsC/AcCn2QafXKM8IeGrHGT545iQtJEMQG61bKgTJZlIiLoHSDRjDRQU5BWyw0nonEL6iG153
icUt2OuNDs10Cn5MmTVw8yP5ha3oO9pYztZkiKRJroiallq5Ow7dN0z9KlnFd5fgQxks7Cv4IyJU
Sq7aTc9Ir/XH124/MZC+OHRfwnRMoSob2OXKE2xdMkG/pp15UxY+N7U5nUHS9ZEFnT7x1HLtRcCG
dQaWKC1WV3C215QRAbtNCfmr9C71tokeFhPr8d7QOy8cUcG5vNonZsKfQMuLchO7AoK53LF9zhDh
nIbszTYe3gyaOg2C0I4Dy1yRBgtjCe/XhTboCzgHPxwhluFmfRQ2crIpGsPpYy0g6YQoX+8UbIGW
BgkMpF20Te1gjOk8o+Ij8WqVVhEcLVdT3vpI9e3kn1lJJOEN2OoGD3+dAjGmqkGfHznFFLAy7RRV
9DYU5gnhh7vOfukMF9ShL0N1K5xnvxzZg7kPId16K98I1urUJa35jk2tPSV+Lp9Uhoon26CvQ5kS
V+7S/D19WsdIrYZiLGx3imzzKZOY3TkDRNLOJw6RqNLOBmdbW7LG+hzigu8aLslzqqoPN1lcze+Y
WoaDlV5atX3Ftl+XDcoqZYsw6Cbin5Y7NIpCkpBxyCcFY5WQWR6S+xcf+LuSKcKEh19qH1A=


--===============1239864538==--