bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3261 to 3262) WL#5569

[Andrei Elkin]

 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
     {


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