1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5.5 -> 10.0-base

Browse Source
This commit is contained in:
Alexander Barkov 2013-10-16 20:41:50 +04:00
commit b88bf50ec1
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/valgrind.supp
View File

@ -1096,6 +1096,18 @@
fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
} }
{
OpenSSL still reachable.
Memcheck:Leak
fun:*alloc
fun:CRYPTO_malloc
fun:sk_new
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

4
sql/mysqld.cc
View File

@ -2702,6 +2702,9 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache)
mysql_mutex_unlock(&LOCK_thread_count); mysql_mutex_unlock(&LOCK_thread_count);
} }
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
#ifndef EMBEDDED_LIBRARY
ERR_remove_state(0);
#endif
my_thread_end(); my_thread_end();
pthread_exit(0); pthread_exit(0);
@ -4260,6 +4263,7 @@ static void init_ssl()
opt_ssl_ca, opt_ssl_capath, opt_ssl_ca, opt_ssl_capath,
opt_ssl_cipher, &error); opt_ssl_cipher, &error);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
ERR_remove_state(0);
if (!ssl_acceptor_fd) if (!ssl_acceptor_fd)
{ {
sql_print_warning("Failed to setup SSL"); sql_print_warning("Failed to setup SSL");

2
sql/slave.cc
View File

@ -3962,6 +3962,7 @@ err_during_init:
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
ERR_remove_state(0);
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }
@ -4448,6 +4449,7 @@ err_during_init:
DBUG_LEAVE; // Must match DBUG_ENTER() DBUG_LEAVE; // Must match DBUG_ENTER()
my_thread_end(); my_thread_end();
ERR_remove_state(0);
pthread_exit(0); pthread_exit(0);
return 0; // Avoid compiler warnings return 0; // Avoid compiler warnings
} }

6
vio/vio.c
View File

@ -309,5 +309,11 @@ void vio_end(void)
{ {
#ifdef HAVE_YASSL #ifdef HAVE_YASSL
yaSSL_CleanUp(); 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();
#endif #endif
} }