bzr push into mysql-5.6 branch (tor.didriksen:4650 to 4651) Bug#15908967

[Tor Didriksen]

 4651 Tor Didriksen	2012-11-23
      Bug#15908967 VALGRIND ERRORS WHEN RUNNING WITH OPENSSL
     @ mysql-test/mysql-test-run.pl
        Remove the (recently added) pattern for "still reachable" in the server log.
     @ mysql-test/valgrind.supp
        Remove the (recently added) suppress patterns for OpenSSL.
     @ vio/vio.c
        Call openssl cleanup functions in vio_end()

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/valgrind.supp
      vio/vio.c
 4650 Ashish Agarwal	2012-11-23
      BUG#14588148: PASSWORD VALIDATION PLUGIN DOES NOT
                    WARN ON INVALID DICTIONARY FILE
      
                    Patch to fix the test-case failing on
                    on mysql-5.6

    modified:
      mysql-test/r/wl6443_deprecation.result
      mysql-test/t/wl6443_deprecation.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-11-20 12:08:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-11-23 08:18:22 +0000
@@ -6265,7 +6265,6 @@ sub valgrind_exit_reports() {
         $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 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2012-11-16 16:13:07 +0000
+++ b/mysql-test/valgrind.supp	2012-11-23 08:18:22 +0000
@@ -1034,85 +1034,3 @@
    fun:_Z*10write_keysP10Sort_paramP13Filesort_infojP11st_io_cacheS4_
    fun:_Z8filesortP3THDP5TABLEP8FilesortbPyS5_
 }
-
-{
-   OpenSSL / one
-   Memcheck:Cond
-   fun:BN_bin2bn
-   fun:bnrand
-   fun:generate_key
-   fun:ssl3_ctx_ctrl
-}
-
-{
-   OpenSSL / two
-   Memcheck:Cond
-   fun:BN_num_bits_word
-   fun:BN_num_bits
-   fun:BN_mod_exp_mont_consttime
-   fun:generate_key
-   fun:ssl3_ctx_ctrl
-}
-
-{
-   OpenSSL / three
-   Memcheck:Value8
-   fun:BN_num_bits_word
-   fun:BN_num_bits
-   fun:BN_mod_exp_mont_consttime
-   fun:generate_key
-   fun:ssl3_ctx_ctrl
-}
-
-{
-   OpenSSL / four
-   Memcheck:Cond
-   ...
-   fun:ssl3_send_server_key_exchange
-   fun:ssl3_accept
-   fun:ssl_do
-}
-
-{
-   OpenSSL / five
-   Memcheck:Value8
-   ...
-   fun:ssl3_send_server_key_exchange
-   fun:ssl3_accept
-   fun:ssl_do
-}
-
-{
-   OpenSSL / five
-   Memcheck:Param
-   write(buf)
-   ...
-   fun:BIO_write
-   fun:buffer_ctrl
-   fun:ssl3_accept
-   fun:ssl_do
-}
-
-{
-   OpenSSL / xxx1
-   Memcheck:Value8
-   fun:bn_mul4x_mont_gather5
-}
-
-{
-   OpenSSL / xxx2
-   Memcheck:Value8
-   fun:bn_mul_mont
-}
-
-{
-   OpenSSL / xxx3
-   Memcheck:Value8
-   fun:bn_mul4x_mont
-}
-
-{
-   OpenSSL / xxx4
-   Memcheck:Value8
-   fun:bn_sqr4x_mont
-}

=== modified file 'vio/vio.c'
--- a/vio/vio.c	2012-03-06 14:29:42 +0000
+++ b/vio/vio.c	2012-11-23 08:18:22 +0000
@@ -349,7 +349,11 @@ void vio_delete(Vio* vio)
 */
 void vio_end(void)
 {
-#ifdef HAVE_YASSL
+#if defined(HAVE_YASSL)
   yaSSL_CleanUp();
+#elif defined(HAVE_OPENSSL)
+  ERR_free_strings();
+  EVP_cleanup();
+  CRYPTO_cleanup_all_ex_data();
 #endif
 }

No bundle (reason: useless for push emails).