bzr push into mysql-trunk branch (andrei.elkin:3724 to 3725)

[Andrei Elkin]

 3725 Andrei Elkin	2012-04-23
      post-push fixes bug11754117-45670: fixing a race of RLI cleanup before delete thd.

    modified:
      sql/rpl_slave.cc
 3724 Georgi Kodinov	2012-04-23 [merge]
      merge

    modified:
      configure.cmake
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2012-04-21 12:11:15 +0000
+++ b/sql/rpl_slave.cc	2012-04-23 18:20:01 +0000
@@ -4339,6 +4339,15 @@ pthread_handler_t handle_slave_worker(vo
 
   mysql_mutex_unlock(&rli->pending_jobs_lock);
 
+  /* 
+     In MTS case cleanup_after_session() has be called explicitly.
+     TODO: to make worker thd be deleted before Slave_worker instance.
+  */
+  if (thd->rli_slave)
+  {
+    w->cleanup_after_session();
+    thd->rli_slave= NULL;
+  }
   mysql_mutex_lock(&w->jobs_lock);
 
   w->running_status= Slave_worker::NOT_RUNNING;

No bundle (reason: useless for push emails).