diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-11 10:54:43 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-11 10:54:43 +0200 |
| commit | e81ecc9c72d240a1b6d9d6619f4654d412da4090 (patch) | |
| tree | 3126bf8cc7e1d24729cd82d473725a0b096411d1 /sql/slave.cc | |
| parent | 5b75891b7b2d2803d93115f244f00d91c12b79d6 (diff) | |
| download | mariadb-git-e81ecc9c72d240a1b6d9d6619f4654d412da4090.tar.gz | |
MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replication causing replication to fail.
Fix a bug discovered in Buildbot valgrind. The logic in checking for slave
init thread completion was reversed, so depending on thread scheduling server
startup could hang.
Also add another variant of SSL valgrind suppression, needed for different
library version.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 2f832309d94..2fa4ebaef0f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -349,7 +349,7 @@ run_slave_init_thread() } mysql_mutex_lock(&LOCK_slave_init); - while (!slave_init_thread_running) + while (slave_init_thread_running) mysql_cond_wait(&COND_slave_init, &LOCK_slave_init); mysql_mutex_unlock(&LOCK_slave_init); |