Merge with 5.2

1 files changed, 44 insertions, 0 deletions

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 5f37fc1dc9e..cbf73fa4d8a 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -489,6 +489,37 @@
 }
 
 {
+   dlsym memory loss from plugin on SuSE 11.1 x64
+   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
    Memcheck:Leak
    fun:*alloc
@@ -549,6 +580,19 @@
 {
    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