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

merge bug#38205 fixes to 5.1-bt

Browse Source
This commit is contained in:
Andrei Elkin
2009-04-21 11:30:40 +03:00
parent 3cac98cb93 a3299de2f7
commit 19fd076fb1
7 changed files with 350 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/slave.cc
View File

@ -698,6 +698,9 @@ static bool sql_slave_killed(THD* thd, Relay_log_info* rli)
DBUG_ASSERT(rli->slave_running == 1);// tracking buffer overrun
if (abort_loop || thd->killed || rli->abort_slave)
{
if (rli->abort_slave && rli->is_in_group() &&
thd->transaction.all.modified_non_trans_table)
DBUG_RETURN(0);
/*
If we are in an unsafe situation (stopping could corrupt replication),
we give one minute to the slave SQL thread of grace before really