Commit bf9521d2 authored by unknown's avatar unknown
Browse files

Fixing manual merge error. 


sql/slave.cc:
  Removing piece of code which get there when manual merging from 5.0 tree.
parent b3c7224c

sql/slave.cc

+0 −7
Original line number Diff line number Diff line
@@ -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