Merge lp:~laurynas-biveinis/percona-server/bug1334743-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Fix bug 1334743 (Numerous Valgrind errors in OpenSSL).

Add the necessary OpenSSL library calls to release its allocated
memory. The patch is based on lp:mysql-server/5.6 rev 4591.1.60
with some extra cleanups.

At the same time, mark Valgrind error of still reachable memory as an
MTR Valgrind reporter error.

http://jenkins.percona.com/job/percona-server-5.5-param/1024/
http://jenkins.percona.com/job/percona-server-5.5-valgrind/368/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2014-03-27 15:42:21 +0000
+++ mysql-test/mysql-test-run.pl	2014-07-12 13:07:55 +0000
@@ -5978,6 +5978,7 @@
         $err_in_report= 1 if $line =~ /ERROR SUMMARY: [1-9]/;
         $err_in_report= 1 if $line =~ /definitely lost: [1-9]/;
         $err_in_report= 1 if $line =~ /possibly lost: [1-9]/;
+        $err_in_report= 1 if $line =~ /still reachable: [1-9]/;
       }
     }
 
 
=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2014-03-27 15:42:21 +0000
+++ sql/mysqld.cc	2014-07-12 13:07:55 +0000
@@ -2122,6 +2122,10 @@
 
   thd->disconnect();
 
+#ifdef HAVE_OPENSSL
+  ERR_remove_state(0);
+#endif
+
   MYSQL_CONNECTION_DONE((int) sql_errno, thd->thread_id);
 
   if (MYSQL_CONNECTION_DONE_ENABLED())
@@ -3797,6 +3801,7 @@
     ssl_acceptor_fd= new_VioSSLAcceptorFd(opt_ssl_key, opt_ssl_cert,
 					  opt_ssl_ca, opt_ssl_capath,
 					  opt_ssl_cipher, &error);
+    ERR_remove_state(0);
     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
     if (!ssl_acceptor_fd)
     {
 
=== modified file 'sql/slave.cc'
--- sql/slave.cc	2014-03-05 12:38:27 +0000
+++ sql/slave.cc	2014-07-12 13:07:55 +0000
@@ -3179,6 +3179,7 @@
 
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
+  ERR_remove_state(0);
   pthread_exit(0);
   return 0;                                     // Avoid compiler warnings
 }
 
=== modified file 'vio/vio.c'
--- vio/vio.c	2013-01-30 09:55:26 +0000
+++ vio/vio.c	2014-07-12 13:07:55 +0000
@@ -310,5 +310,10 @@
 {
 #ifdef HAVE_YASSL
   yaSSL_CleanUp();
+#elif defined(HAVE_OPENSSL)
+  ERR_free_strings();
+  EVP_cleanup();
+  CRYPTO_cleanup_all_ex_data();
+  sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
 #endif
 }