List:Commits« Previous MessageNext Message »
From:msvensson Date:May 23 2006 6:17pm
Subject:bk commit into 5.0 tree (msvensson:1.2141) BUG#19938
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2141 06/05/23 20:16:57 msvensson@neptunus.(none) +1 -0
  Bug#19938 Valgrind error (race) in handle_slave_sql()

  sql/slave.cc
    1.269 06/05/23 20:16:52 msvensson@neptunus.(none) +2 -0
    Read the value of rli->events_till_abort only in debug compile

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.268/sql/slave.cc	2006-05-23 16:19:59 +02:00
+++ 1.269/sql/slave.cc	2006-05-23 20:16:52 +02:00
@@ -3950,11 +3950,13 @@
   pthread_mutex_unlock(&LOCK_thread_count);
   pthread_cond_broadcast(&rli->stop_cond);
 
+#ifndef DBUG_OFF
   /*
     Bug #19938 Valgrind error (race) in handle_slave_sql()
     Read the value of rli->event_till_abort before releasing the mutex
   */
   const int eta= rli->events_till_abort;
+#endif
 
   // tell the world we are done
   pthread_mutex_unlock(&rli->run_lock);
Thread
bk commit into 5.0 tree (msvensson:1.2141) BUG#19938msvensson23 May