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

[Andrei Elkin]

#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
     {


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