broad suppression for dlsym "memory leak" - same as for dlclose

1 files changed, 6 insertions, 77 deletions

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index b0d754211cd..54f8c9b45f9 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -158,16 +158,6 @@
    fun:_dl_start
 }
 
-{
-   pthread errno
-   Memcheck:Leak
-   fun:calloc
-   fun:_dlerror_run
-   fun:dlsym
-   fun:__errno_location
-}
-
-
 #
 # Warnings in libz becasue it works with aligned memory(?)
 #
@@ -427,46 +417,18 @@
 }
 
 
+#
+#  dlsym can allocate memory for error message, the memory will be
+#  freed by dlerror or other dl* function.
+#
 {
-   dlclose memory loss from plugin variant 10
-   Memcheck:Leak
-   fun:calloc
-   obj:/lib*/libdl-*.so
-   fun:dlclose
-   fun:*free_plugin_mem*
-   fun:*plugin_dl_del*
-}
-
-{
-   dlsym memory loss from plugin on SuSE 11.1 x64
+   memory "loss" from dlclose error messages
    Memcheck:Leak
    fun:*alloc
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libdl-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/libdl-*.so
+   ...
    fun:dlsym
-   fun:*plugin_dl_add*
 }
 
-{
-   dlsym memory loss from plugin on SuSE 11.3 x64 when using oqgraph
-   Memcheck:Leak
-   fun:*calloc
-   fun:do_lookup_x
-   fun:_dl_lookup_symbol_x
-   fun:_dl_relocate_object
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-   fun:dlopen_doit
-   fun:_dl_catch_error
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.2.5
-}
 
 {
    dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit ver 1
@@ -519,39 +481,6 @@
    fun:_Unwind_ForcedUnwind
 }
 
-{
-   dlsym memory loss from plugin
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_signal_error
-}
-
-{
-   dlsym memory loss from plugin version 2
-   Memcheck:Leak
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libdl-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/libdl-*.so
-   fun:dlsym
-}
-
-{
-   dlsym memory loss from plugin version 3
-   Memcheck:Leak
-   fun:malloc
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/ld-*.so
-   obj:/lib*/libc-*.so)
-   obj:/lib*/libdl-*.so)
-   obj:/lib*/ld-*.so)
-   obj:/lib*/libdl-*.so)
-   fun:dlsym
-}
 
 #
 # Reading wrong addresses on SuSe Linux 10.3 32 bit