From: Andrei Elkin
Date: June 21 2011 11:32am
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3313) WL#5569
List-Archive: http://lists.mysql.com/commits/139555
Message-Id: <201106211132.p5LBWRxS031104@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1461142904=="

--===============1461142904==
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:alfranio.correia@stripped

 3313 Andrei Elkin	2011-06-21
      wl#5569 MTS
      
      fixing few valgrind warnings.
     @ sql/log_event.cc
        Checking running status instead of THD::killed for the worker.
     @ sql/rpl_rli_pdb.cc
        Valgrind sensitive assert is commented out.
     @ sql/rpl_slave.cc
        Relocating a print-out to an earlier executing point where anynchrounously
        deletable event is still available.

    modified:
      sql/log_event.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-06-19 09:33:36 +0000
+++ b/sql/log_event.cc	2011-06-21 11:32:21 +0000
@@ -2801,7 +2801,7 @@ void append_item_to_jobs(slave_job_item 
   mysql_mutex_lock(&w->jobs_lock);
 
   // possible WQ overfill
-  while (!w->info_thd->killed && !thd->killed &&
+  while (w->running_status == Slave_worker::RUNNING && !thd->killed &&
          (ret= en_queue(&w->jobs, job_item)) == -1)
   {
     const char *old_msg;

=== modified file 'sql/rpl_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2011-06-20 22:19:06 +0000
+++ b/sql/rpl_rli_pdb.cc	2011-06-21 11:32:21 +0000
@@ -308,9 +308,14 @@ static void free_entry(db_worker_hash_en
   DBUG_PRINT("info", ("free_entry %s, %d", entry->db, (int) strlen(entry->db)));
 
   DBUG_ASSERT(c_thd->system_thread == SYSTEM_THREAD_SLAVE_SQL);
-  DBUG_ASSERT(entry->usage == 0 ||
-              !entry->worker    ||  // the last entry owner could have errored out
-              entry->worker->running_status != Slave_worker::RUNNING);
+
+  /*
+    Although assert is correct valgrind senses entry->worker can be freed.
+
+    DBUG_ASSERT(entry->usage == 0 ||
+                !entry->worker    ||  // last entry owner could have errored out
+                entry->worker->running_status != Slave_worker::RUNNING);
+  */
 
   mts_move_temp_tables_to_thd(c_thd, entry->temporary_tables);
   entry->temporary_tables= NULL;

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-06-20 13:32:33 +0000
+++ b/sql/rpl_slave.cc	2011-06-21 11:32:21 +0000
@@ -2832,15 +2832,14 @@ int apply_event_and_update_pos(Log_event
           rli->curr_group_da.elements= 0;
         }
 
-        //job_item->data= ev;
-        /* Notice `ev' instance can be destoyed after `append()' */
-        append_item_to_jobs(job_item, w, rli);
         /*
           ALFRANIO --> Add more debug messages.
         */
         DBUG_PRINT("Mts-jobs", ("Assigning Jobs %lu to Worker %lu\n",
                    (long unsigned int) ((Log_event* )job_item->data)->log_pos, w->id));
 
+        /* Notice `ev' instance can be destoyed after `append()' */
+        append_item_to_jobs(job_item, w, rli);
         if (need_sync)
         {
           /*


--===============1461142904==
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: 11c5a4f7b7add16df993c33a4654c46ee5b91f6f
# timestamp: 2011-06-21 14:32:27 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: alfranio.correia@stripped\
#   sfyyfaisztf64299
# 
# Begin bundle
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


--===============1461142904==--