database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
This commit is contained in:
rafal@quant.(none)
2007-03-01 10:03:42 +01:00
parent 504b4d2dfb 5efe0e4a2f
commit 9c950bca95
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/slave.cc
View File

@ -2205,11 +2205,16 @@ err:
THD_CHECK_SENTRY(thd); THD_CHECK_SENTRY(thd);
delete thd; delete thd;
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
mi->abort_slave = 0; mi->abort_slave= 0;
mi->slave_running = 0; mi->slave_running= 0;
mi->io_thd = 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_cond_broadcast(&mi->stop_cond); // tell the world we are done
pthread_mutex_unlock(&mi->run_lock);
my_thread_end(); my_thread_end();
pthread_exit(0); pthread_exit(0);
DBUG_RETURN(0); // Can't return anything here DBUG_RETURN(0); // Can't return anything here
@ -2455,9 +2460,21 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
THD_CHECK_SENTRY(thd); THD_CHECK_SENTRY(thd);
delete thd; delete thd;
pthread_mutex_unlock(&LOCK_thread_count); 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
delete the mi structure leading to a crash! (see BUG#25306 for details)
*/
pthread_cond_broadcast(&rli->stop_cond); pthread_cond_broadcast(&rli->stop_cond);
// tell the world we are done pthread_mutex_unlock(&rli->run_lock); // tell the world we are done
pthread_mutex_unlock(&rli->run_lock);
my_thread_end(); my_thread_end();
pthread_exit(0); pthread_exit(0);
DBUG_RETURN(0); // Can't return anything here DBUG_RETURN(0); // Can't return anything here

8
sql/sql_repl.cc
View File

@ -886,12 +886,14 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report)
int stop_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; int slave_errno;
if (!thd) if (!thd)
thd = current_thd; thd = current_thd;
if (check_access(thd, SUPER_ACL, any_db,0,0,0,0)) if (check_access(thd, SUPER_ACL, any_db,0,0,0,0))
return 1; DBUG_RETURN(1);
thd->proc_info = "Killing slave"; thd->proc_info = "Killing slave";
int thread_mask; int thread_mask;
lock_slave_threads(mi); lock_slave_threads(mi);
@ -925,12 +927,12 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )
{ {
if (net_report) if (net_report)
my_message(slave_errno, ER(slave_errno), MYF(0)); my_message(slave_errno, ER(slave_errno), MYF(0));
return 1; DBUG_RETURN(1);
} }
else if (net_report) else if (net_report)
send_ok(thd); send_ok(thd);
return 0; DBUG_RETURN(0);
} }