List:Commits« Previous MessageNext Message »
From:rsomla Date:March 1 2007 10:52am
Subject:bk commit into 5.1 tree (rafal:1.2469)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal 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@stripped, 2007-03-01 11:52:20+01:00, rafal@quant.(none) +1 -0
  Fixing manual merge error.

  sql/slave.cc@stripped, 2007-03-01 11:52:18+01:00, rafal@quant.(none) +0 -7
    Removing piece of code which get there when manual merging from 5.0 tree.

# 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:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bkroot/mysql-5.1-new-rpl

--- 1.311/sql/slave.cc	2007-03-01 11:52:23 +01:00
+++ 1.312/sql/slave.cc	2007-03-01 11:52:23 +01:00
@@ -2460,13 +2460,6 @@
   THD_CHECK_SENTRY(thd);
   delete thd;
   pthread_mutex_unlock(&LOCK_thread_count);
-#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
  /*
   Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)
   is important. Otherwise a killer_thread can execute between the calls and
Thread
bk commit into 5.1 tree (rafal:1.2469)rsomla1 Mar