Skip to content

M
mariadb
Commit ebedae2c authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143

parent 9580c05c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 11 deletions
sql/slave.cc
View file @ ebedae2c
...@@ -3950,20 +3950,11 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ ...@@ -3950,20 +3950,11 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_broadcast(&rli->stop_cond); pthread_cond_broadcast(&rli->stop_cond);
// 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 #ifndef DBUG_OFF // TODO: reconsider the code below
if (abort_slave_event_count && !rli->events_till_abort) if (abort_slave_event_count && !rli->events_till_abort)
{
/*
Bug #19938 Valgrind error (race) in handle_slave_sql()
Read the value of rli->event_till_abort before releasing the mutex
*/
pthread_mutex_unlock(&rli->run_lock);
goto slave_begin; goto slave_begin;
} #endif
#endif
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7