[Commits] Rev 4286: MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replication causing replication to fail. in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Jul 11 11:54:44 EEST 2014


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4286
revision-id: knielsen at knielsen-hq.org-20140711085443-xer7raycpredmyy0
parent: knielsen at knielsen-hq.org-20140710122453-prl2drw7d4zpyq8u
committer: Kristian Nielsen <knielsen at knielsen-hq.org>
branch nick: tmp-10.0
timestamp: Fri 2014-07-11 10:54:43 +0200
message:
  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.
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2014-03-12 09:24:03 +0000
+++ b/mysql-test/valgrind.supp	2014-07-11 08:54:43 +0000
@@ -1138,6 +1138,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
   Memcheck:Cond
    obj:*/libresolv*.so

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2014-07-08 10:54:47 +0000
+++ b/sql/slave.cc	2014-07-11 08:54:43 +0000
@@ -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);
 



More information about the commits mailing list