mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 5.3->5.5
This commit is contained in:
@ -1096,6 +1096,18 @@
|
||||
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
|
||||
Memcheck:Cond
|
||||
|
@ -2615,6 +2615,9 @@ bool one_thread_per_connection_end(THD *thd, bool put_in_cache)
|
||||
/* It's safe to broadcast outside a lock (COND... is not deleted here) */
|
||||
DBUG_PRINT("signal", ("Broadcasting COND_thread_count"));
|
||||
DBUG_LEAVE; // Must match DBUG_ENTER()
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
ERR_remove_state(0);
|
||||
#endif
|
||||
my_thread_end();
|
||||
mysql_cond_broadcast(&COND_thread_count);
|
||||
|
||||
@ -4071,6 +4074,7 @@ static void init_ssl()
|
||||
opt_ssl_ca, opt_ssl_capath,
|
||||
opt_ssl_cipher, &error);
|
||||
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");
|
||||
|
@ -3377,6 +3377,7 @@ err_during_init:
|
||||
|
||||
DBUG_LEAVE; // Must match DBUG_ENTER()
|
||||
my_thread_end();
|
||||
ERR_remove_state(0);
|
||||
pthread_exit(0);
|
||||
return 0; // Avoid compiler warnings
|
||||
}
|
||||
@ -3782,6 +3783,7 @@ err_during_init:
|
||||
|
||||
DBUG_LEAVE; // Must match DBUG_ENTER()
|
||||
my_thread_end();
|
||||
ERR_remove_state(0);
|
||||
pthread_exit(0);
|
||||
return 0; // Avoid compiler warnings
|
||||
}
|
||||
|
Reference in New Issue
Block a user