mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Previous patch didn't work: moving variable settings inside critical region.
This commit is contained in:
mats@romeo.(none) 2006-07-07 18:31:00 +02:00
parent a3978ceb33
commit 4044fb8cc7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/slave.cc
View file

@ -3546,12 +3546,12 @@ 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);
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->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);
pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done
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
} }