Commit 44bdb070 authored by unknown's avatar unknown
Browse files

Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 

into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306


sql/slave.cc:
  Auto merged
parents 9dfb1d90 d51d6adc

sql/slave.cc

+14 −5
Original line number Diff line number Diff line
@@ -3758,8 +3758,13 @@ log space"); 
  mi->abort_slave= 0;

  mi->slave_running= 0;

  mi->io_thd= 0;

  pthread_mutex_unlock(&mi->run_lock);

  /*

    Note: the order of the two following calls (first broadcast, then unlock)

    is important. Otherwise a killer_thread can execute between the calls and

    delete the mi structure leading to a crash! (see BUG#25306 for details)

   */ 

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

  pthread_mutex_unlock(&mi->run_lock);

#ifndef DBUG_OFF

  if (abort_slave_event_count && !events_till_abort)

    goto slave_begin;
@@ -3977,8 +3982,13 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ 
  THD_CHECK_SENTRY(thd);

  delete thd;

  pthread_mutex_unlock(&LOCK_thread_count);

  pthread_cond_broadcast(&rli->stop_cond);



 /*

  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

  delete the mi structure leading to a crash! (see BUG#25306 for details)

 */ 

  pthread_cond_broadcast(&rli->stop_cond);

#ifndef DBUG_OFF

  /*

    Bug #19938 Valgrind error (race) in handle_slave_sql()
@@ -3986,9 +3996,8 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ 
  */

  const int eta= rli->events_till_abort;

#endif

  pthread_mutex_unlock(&rli->run_lock);  // tell the world we are done

  

  // tell the world we are done

  pthread_mutex_unlock(&rli->run_lock);

#ifndef DBUG_OFF // TODO: reconsider the code below

  if (abort_slave_event_count && !eta)

    goto slave_begin;

sql/sql_repl.cc

+5 −3
Original line number Diff line number Diff line
@@ -882,12 +882,14 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) 


int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )

{

  DBUG_ENTER("stop_slave");

  

  int slave_errno;

  if (!thd)

    thd = current_thd;



  if (check_access(thd, SUPER_ACL, any_db,0,0,0,0))

    return 1;

    DBUG_RETURN(1);

  thd->proc_info = "Killing slave";

  int thread_mask;

  lock_slave_threads(mi);
@@ -921,12 +923,12 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report ) 
  {

    if (net_report)

      my_message(slave_errno, ER(slave_errno), MYF(0));

    return 1;

    DBUG_RETURN(1);

  }

  else if (net_report)

    send_ok(thd);



  return 0;

  DBUG_RETURN(0);

}