From: Andrei Elkin
Date: December 23 2010 5:03pm
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3265)
List-Archive: http://lists.mysql.com/commits/127566
Message-Id: <201012231703.oBNH3tcI009452@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1934065906=="

--===============1934065906==
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

 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);


--===============1934065906==
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: cba1fdc36ba74aa319ea132aa1b0d0f460f9bfad
# timestamp: 2010-12-23 19:03:55 +0200
# base_revision_id: andrei.elkin@stripped\
#   qvc7jgcn1d5u52za
# 
# Begin bundle
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
xpIKWpkFpif/F3JFOFCQJCFvug==


--===============1934065906==--