From: Tor Didriksen
Date: December 11 2012 3:57pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:5212 to 5213)
List-Archive: http://lists.mysql.com/commits/145488
Message-Id: <20121211155723.22868.87308.5213@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5213 Tor Didriksen	2012-12-11 [merge]
      merge 5.6 => trunk

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/valgrind.supp
      sql/mysqld.cc
      sql/rpl_slave.cc
      vio/vio.c
 5212 Jon Olav Hauglid	2012-12-11
      Bug#15965959: REMOVE WAITING_THREADS.H/.CC
      
      This patch removes waiting_threads.h/.cc as these files
      are no longer in use.

    removed:
      include/waiting_threads.h
      mysys/waiting_threads.c
    modified:
      include/my_global.h
      mysys/CMakeLists.txt
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-12-11 13:11:14 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-12-11 15:56:03 +0000
@@ -6282,6 +6282,7 @@ 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-12-05 07:41:53 +0000
+++ b/mysql-test/valgrind.supp	2012-12-11 15:56:03 +0000
@@ -1036,25 +1036,7 @@
 }
 
 {
-   OpenSSL still reachable. One.
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_put_error
-   fun:PEM_read_bio
-   fun:PEM_X509_INFO_read_bio
-   fun:X509_load_cert_crl_file
-   fun:by_file_ctrl
-   fun:X509_STORE_load_locations
-   fun:new_VioSSLFd
-   fun:new_VioSSLAcceptorFd
-}
-
-{
-   OpenSSL still reachable. Two.
+   OpenSSL still reachable.
    Memcheck:Leak
    fun:malloc
    fun:CRYPTO_malloc
@@ -1064,56 +1046,6 @@
    fun:SSL_library_init
    fun:check_ssl_init
    fun:new_VioSSLFd
-   fun:new_VioSSLAcceptorFd
-}
-
-{
-   OpenSSL still reachable. Three.
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:load_builtin_compressions
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:check_ssl_init
-   fun:new_VioSSLFd
-   fun:new_VioSSLAcceptorFd
-}
-
-{
-   OpenSSL still reachable. Four.
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_thread_get
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_put_error
-   fun:PEM_read_bio
-   fun:PEM_X509_INFO_read_bio
-   fun:X509_load_cert_crl_file
-   fun:by_file_ctrl
-   fun:X509_STORE_load_locations
-   fun:new_VioSSLFd
-   fun:new_VioSSLAcceptorFd
-}
-
-{
-   OpenSSL still reachable. Five.
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:ERR_get_state
-   fun:ERR_put_error
-   fun:PEM_read_bio
-   fun:PEM_X509_INFO_read_bio
-   fun:X509_load_cert_crl_file
-   fun:by_file_ctrl
-   fun:X509_STORE_load_locations
-   fun:new_VioSSLFd
-   fun:new_VioSSLAcceptorFd
 }
 {
    BUG#14801497 CONDITIONAL JUMP OR MOVE DEPENDS ON UNINITIALISED VALUE(S) IN CREATE_TMP_TABLE

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-12-06 13:22:21 +0000
+++ b/sql/mysqld.cc	2012-12-11 15:56:03 +0000
@@ -2673,6 +2673,9 @@ bool one_thread_per_connection_end(THD *
   DBUG_PRINT("signal", ("Broadcasting COND_thread_count"));
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
+#ifndef EMBEDDED_LIBRARY
+  ERR_remove_state(0);
+#endif
   mysql_cond_broadcast(&COND_thread_count);
 
   pthread_exit(0);
@@ -4268,6 +4271,7 @@ static int init_ssl()
 					  opt_ssl_cipher, &error,
                                           opt_ssl_crl, opt_ssl_crlpath);
     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
+    ERR_remove_state(0);
     if (!ssl_acceptor_fd)
     {
       sql_print_warning("Failed to setup SSL");

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2012-12-05 05:43:39 +0000
+++ b/sql/rpl_slave.cc	2012-12-11 15:56:03 +0000
@@ -4336,6 +4336,7 @@ err:
   mysql_mutex_unlock(&mi->run_lock);
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
+  ERR_remove_state(0);
   pthread_exit(0);
   return(0);                                    // Avoid compiler warnings
 }
@@ -4531,6 +4532,7 @@ err:
   }
 
   my_thread_end();
+  ERR_remove_state(0);
   pthread_exit(0);
   DBUG_RETURN(0); 
 }
@@ -5676,6 +5678,7 @@ llstr(rli->get_group_master_log_pos(), l
 
   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'
--- a/vio/vio.c	2012-11-23 08:24:17 +0000
+++ b/vio/vio.c	2012-12-11 15:56:03 +0000
@@ -352,6 +352,8 @@ void vio_end(void)
 #if defined(HAVE_YASSL)
   yaSSL_CleanUp();
 #elif defined(HAVE_OPENSSL)
+  // This one is needed on the client side
+  ERR_remove_state(0);
   ERR_free_strings();
   EVP_cleanup();
   CRYPTO_cleanup_all_ex_data();

No bundle (reason: useless for push emails).