Skip to content

M
MariaDB
Commit 00e6bf6e authored by rafal@quant.(none)'s avatar rafal@quant.(none)
Browse files
Options

Fixing manual merge error.

parent 9c950bca
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
sql/slave.cc
View file @ 00e6bf6e
...@@ -2460,13 +2460,6 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ ...@@ -2460,13 +2460,6 @@ 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) 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 is important. Otherwise a killer_thread can execute between the calls and
......
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