Commit 0d830d16 authored by unknown's avatar unknown
Browse files

Bug#20850 (Assert during slave shutdown in many rpl_* tests): 

Previous patch didn't work: moving variable settings inside critical region.


sql/slave.cc:
  Moving variable setting inside critical region (again) when
  terminating slave I/O thread.
parent bdb26fff

sql/slave.cc

+3 −3
Original line number Diff line number Diff line
@@ -3546,12 +3546,12 @@ log space"); 
  THD_CHECK_SENTRY(thd);

  delete thd;

  pthread_mutex_unlock(&LOCK_thread_count);

  pthread_cond_broadcast(&mi->stop_cond);       // tell the world we are done

  pthread_mutex_unlock(&mi->run_lock);

  my_thread_end();

  mi->abort_slave = 0;

  mi->slave_running = 0;

  mi->io_thd = 0;

  pthread_mutex_unlock(&mi->run_lock);

  pthread_cond_broadcast(&mi->stop_cond);       // tell the world we are done

  my_thread_end();

  pthread_exit(0);

  DBUG_RETURN(0);                               // Can't return anything here

}