mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Fixing manual merge error.
This commit is contained in:
@@ -2460,13 +2460,6 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \
|
||||
THD_CHECK_SENTRY(thd);
|
||||
delete thd;
|
||||
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
|
||||
|
Reference in New Issue
Block a user