Fixing manual merge error.

00e6bf6e · rafal@quant.(none) · 9c950bca · 00e6bf6e
Commit 00e6bf6e authored Mar 01, 2007 by rafal@quant.(none)
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

sql/slave.cc sql/slave.cc +0 -7

No files found.
--- 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