1 files changed, 24 insertions, 89 deletions

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index b5c9b62049b..c3e7d1c65ec 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -19,36 +19,6 @@
 # Suppress some common (not fatal) errors in system libraries found by valgrind
 #
 
-#
-# Pthread doesn't free all thread specific memory before program exists
-#
-{
-   pthread allocate_tls memory loss
-   Memcheck:Leak
-   fun:calloc
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create*
-}
-
-{
-   pthread allocate_tls memory loss
-   Memcheck:Leak
-   fun:calloc
-   fun:_dl_allocate_tls
-   fun:pthread_create*
-
-}
-
-{
-   pthread allocate_tls memory loss
-   Memcheck:Leak
-   fun:calloc
-   obj:/lib*/ld*.so
-   fun:_dl_allocate_tls
-   fun:pthread_create*
-}
-
 {
    pthead_exit memory loss 1
    Memcheck:Leak
@@ -90,52 +60,6 @@
 }
 
 {
-   pthread allocate_dtv memory loss
-   Memcheck:Leak
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls_storage
-   fun:__GI__dl_allocate_tls
-   fun:pthread_create
-}
-
-{
-   pthread allocate_dtv memory loss second
-   Memcheck:Leak
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:pthread_create*
-}
-
-{
-   pthread memalign memory loss
-   Memcheck:Leak
-   fun:memalign
-   fun:_dl_allocate_tls_storage
-   fun:__GI__dl_allocate_tls
-   fun:pthread_create
-}
-
-{
-   pthread memalign memory loss2
-   Memcheck:Leak
-   fun:memalign
-   fun:tls_get_addr_tail
-   ...
-   fun:*ha_initialize_handlerton*
-}
-
-{
-   pthread memalign memory loss3
-   Memcheck:Leak
-   fun:memalign
-   fun:tls_get_addr_tail
-   ...
-   fun:*ha_finalize_handlerton*
-}
-
-{
    pthread pthread_key_create
    Memcheck:Leak
    fun:malloc
@@ -1006,18 +930,6 @@
    fun:nptl_pthread_exit_hack_handler
 }
 
-#
-# Pthread doesn't free all thread specific memory before program exists
-#
-{
-   pthread allocate_tls memory loss in 2.6.1.
-   Memcheck:Leak 
-   fun:calloc
-   obj:*/ld-*.so
-   fun:_dl_allocate_tls
-   fun:pthread_create*
-}
-
 {
    memory "leak" in backtrace() of glibc 2.9 (not present in 2.13)
    Memcheck:Leak
@@ -1152,6 +1064,13 @@
    fun:SSL_library_init
 }
 
+{
+   libcrypto 2.2.1 leak
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:ERR_get_state
+}
 
 {
   Problem with udf and libresolve
@@ -1163,6 +1082,23 @@
    fun:gethostbyaddr_r
 }
 
+#
+# Detached threads may not complete deiniitialization by the time shutdown
+# thread calls exit. This is unfortunate property of detached threads, which
+# we currently can only ignore. Unfortunately there is no way to distinguish
+# between false positives generated by detached threads and real memory leaks
+# generated by not joined joinable threads. So we hide both cases.
+#
+# To avoid enumeration of the whole variety of possible traces we ignore all
+# "possibly lost" blocks allocated by pthread_create (and it's callees).
+#
+{
+   Detached threads memory loss
+   Memcheck:Leak
+   match-leak-kinds:possible
+   ...
+   fun:pthread_create*
+}
 
 {
   ConnectSE: unixODBC SQLAllocEnv leaves some "still reachable" pointers
@@ -1625,4 +1561,3 @@ g   codership/mysql-wsrep/issues#176
    fun:start_thread
    fun:clone
 }
-