From 00e6bf6e73d6871fc79a95ab5c54737a41530c03 Mon Sep 17 00:00:00 2001
From: "rafal@quant.(none)" <>
Date: Thu, 1 Mar 2007 11:52:20 +0100
Subject: [PATCH] Fixing manual merge error.

---
 sql/slave.cc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index bb2aa11626e..bede185f4c1 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2460,13 +2460,6 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
   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