List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:December 23 2010 1:34pm
Subject:bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3262) WL#5569
View as plain text  
#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

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


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20101223133402-a2h3vnxg6amijucx.bundle
Thread
bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3262) WL#5569Andrei Elkin23 Dec