bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3265)

[Andrei Elkin]

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

 3265 Andrei Elkin	2010-12-23 [merge]
      merging from the repo wl5569

    modified:
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      sql/rpl_slave.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_until.test'
--- a/mysql-test/suite/rpl/t/rpl_row_until.test	2010-06-22 09:34:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_until.test	2010-12-23 14:03:39 +0000
@@ -1,6 +1,7 @@
 -- source include/not_ndb_default.inc
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
+--source include/not_mts_slave_parallel_workers.inc
 
 # Note: The test is dependent on binlog positions
 

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_until.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_until.test	2010-09-28 13:58:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_until.test	2010-12-23 14:03:39 +0000
@@ -19,6 +19,7 @@
 
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/master-slave.inc
+-- source include/not_mts_slave_parallel_workers.inc
 
 # Test is dependent on binlog positions
 

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-23 14:00:28 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 14:03:39 +0000
@@ -4417,8 +4417,6 @@ void slave_stop_workers(Relay_log_info *
     Slave_worker *w;
     get_dynamic((DYNAMIC_ARRAY*)&rli->workers, (uchar*) &w, i);
 
-    w->end_info();
-
     mysql_mutex_lock(&w->jobs_lock);
     while (w->jobs.len != rli->mts_slave_worker_queue_len_max + 1)
     {
@@ -4433,6 +4431,8 @@ void slave_stop_workers(Relay_log_info *
     mysql_mutex_destroy(&w->jobs_lock);
     mysql_cond_destroy(&w->jobs_cond);
 
+    w->end_info();
+
     DBUG_ASSERT(w->jobs.Q.elements == w->jobs.s);
     delete_dynamic(&w->jobs.Q);
     delete_dynamic_element(&rli->workers, i);


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