From: Andrei Elkin
Date: May 28 2011 8:19am
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3284) WL#5569
List-Archive: http://lists.mysql.com/commits/138415
Message-Id: <201105280819.p4S8Jv1N021195@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1065736346=="

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

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

 3284 Andrei Elkin	2011-05-28
      wl#5569 MTS
      
      correcting an assert that was used to fire as warned in the previous commit.
      Parallel feature tests pass now.

    modified:
      sql/rpl_rli_pdb.cc
=== modified file 'sql/rpl_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2011-05-27 21:29:14 +0000
+++ b/sql/rpl_rli_pdb.cc	2011-05-28 08:19:43 +0000
@@ -1100,8 +1100,7 @@ int wait_for_workers_to_finish(Relay_log
       thd->exit_cond(proc_info);
       ret++;
 
-      DBUG_ASSERT((entry->usage == 0 && entry->worker) || 
-                  thd->killed || rli->abort_slave);
+      DBUG_ASSERT(entry->usage == 0 || thd->killed || rli->abort_slave);
     }
     else
     {


--===============1065736346==
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: e3de95e65fad9867935655d20d9fe173c1396d2c
# timestamp: 2011-05-28 11:19:57 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   k720id4iq6eh9ihb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRJ2RvgAAYdfgBAQWGP//3aC
XgC/7//0UAOZrwa3Ho4b3rhKRNKep6ehTankm09EnpNPKegQGTanqG1AyiU/Go2hKe1Rp5TNQAAA
A0AGmkCBMMpPTUGgAeoaMnpDQaAylNiQ0bKDQeo9QGmgAAANBJIBGiNGjQ1TZJmkD0g0AGTQscLz
05RuL1QZrrakAfHQy9qrWiz240EkceWtNzoUrxFiF/nCvWxu7ay/bvyEYfKrBR/KoiymDw1bOu7g
i3PheFYDXxyzw/hEawRC0FaaJCuGkBia3wxdWPwbyR+zJEq6XQk5EvJC84CLgXEyuDCkivMQgcni
onCMuEFbFaoO3QDo2hQYtZocpnvlVgXhtzM3VCgjEhHboCMf3C7YD1kXHjbE2+zAt47xPK36d12G
No7IF3bwxYML2MpqIXjCiGDBojlp5leRaSLhkwsXMRLc37I3uPE034zJxxvH1Cxlwo4N4qnokQIr
y2BZoiWvEf3I8OKKUJF5p40ejFiGqG4brGskeZkVwyKrAUoZVAm54zAoB1aBvF9FUyeMbRR0wUxF
zXiYUoE5mjhWLoOu1D8xd4qFbgYoLZYUuqNTmCerNSLEFXCyZxfaoaFQvLRMA+BXVn1Dyx0U4yYR
Dq46N6iBEMd8JGoUfWHyzjHiqDq4v/ePSzplizqDknK5LX04LCqnOzYXXWP23+hhfzRCbzfmGBOr
NPW9GHkTil/rcZEMCFatrlEtOnclSVO0+3M9YklFKm2A+kEMlULRjS9MIBOC/AxCCQskWmtjIrNg
wx0yIikqlEHSRZcWWKAWCMv566sq8HgRjXciPMwYovNngyhVy2tCR8k1droKKqMqqKTDeEQI3Jql
gVm3LI0Q6xyYrS3RROV10jIEJVo9EmcoJYraHHjXIdm2x8aJwleNY4R5EyCNp67BJgduDLAGK6FJ
/FwJw5by/EO78ppbjtDUu2BtczJK9/LfhDWHXwC1wciGORgEOyALWGXT+DgdYEXhyT86pDETMOP3
oka5Q79YqckixR2zNZOR1ykT2dg+wi00yQ3U94fVyRSNIlwnT6SwRJgZX8dKpQbJBWBMkTkiECiV
6rqS2lNUc2RCCh5SIXsMTlQS6IHOCoTFNsyJNl6LLmALiLZZ0EdlrCpvTVV12zYZqCSHkWSZQPQK
1r1sYRpqkAYJFanb6qSZwCW7TMJrZZYNiTZVO+w9yYJEaX3ARIY5pVK11QmvLHhyFhbcsUU6ihqy
9IuZMMQncVxI6xeZcf8XckU4UJASdkb4


--===============1065736346==--