Commit e81ecc9c authored by Kristian Nielsen's avatar Kristian Nielsen

MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel...

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.
parent 5b75891b
...@@ -1137,6 +1137,17 @@ ...@@ -1137,6 +1137,17 @@
} }
{
OpenSSL still reachable.
Memcheck:Leak
fun:*alloc
fun:CRYPTO_malloc
obj:*libssl*
fun:SSL_COMP_get_compression_methods
fun:SSL_library_init
}
{ {
Problem with udf and libresolve Problem with udf and libresolve
Memcheck:Cond Memcheck:Cond
......
...@@ -349,7 +349,7 @@ run_slave_init_thread() ...@@ -349,7 +349,7 @@ run_slave_init_thread()
} }
mysql_mutex_lock(&LOCK_slave_init); 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_cond_wait(&COND_slave_init, &LOCK_slave_init);
mysql_mutex_unlock(&LOCK_slave_init); mysql_mutex_unlock(&LOCK_slave_init);
......
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