BUG#25659 - memory leak via "plugins" test

- Added suppressions for dlopen to make plugin test pass.
- Do not pass empty string to mysqld, since my_getopt is
  not capable to handle it.
- Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.

The memory leak described in the bug report happens in libdl, not
in mysqld. On some valgrind installations this error is suppressed
by default, no idea why it isn't suppressed on pb-valgrind.

<observation>
If library remains open after thread has finished, and is closed by
another thread, we get memory leak. But in case library is opened and
closed by the same thread no leak occurs.
</observation>

4 files changed, 28 insertions, 4 deletions

diff --git a/mysql-test/lib/mtr_io.pl b/mysql-test/lib/mtr_io.pl
index 570a58875c2..aa671c0f4f7 100644
--- a/mysql-test/lib/mtr_io.pl
+++ b/mysql-test/lib/mtr_io.pl
@@ -120,7 +120,11 @@ sub mtr_get_opts_from_file ($) {
       $arg =~ s/\$(\w+)/envsubst($1)/ge;
 
 #      print STDERR "ARG: $arg\n";
-      push(@args, $arg);
+      # Do not pass empty string since my_getopt is not capable to handle it.
+      if (length($arg))
+      {
+        push(@args, $arg)
+      }
     }
   }
   close FILE;
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result
index 6005bdcae8d..8628acecf55 100644
--- a/mysql-test/r/plugin.result
+++ b/mysql-test/r/plugin.result
@@ -12,5 +12,8 @@ CREATE TABLE t1(a int) ENGINE=EXAMPLE;
 SELECT * FROM t1;
 a
 DROP TABLE t1;
+UNINSTALL PLUGIN example;
+UNINSTALL PLUGIN EXAMPLE;
+ERROR 42000: PLUGIN EXAMPLE does not exist
 UNINSTALL PLUGIN non_exist;
 ERROR 42000: PLUGIN non_exist does not exist
diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test
index 80c1de00b8e..fb6d5febe45 100644
--- a/mysql-test/t/plugin.test
+++ b/mysql-test/t/plugin.test
@@ -18,9 +18,9 @@ SELECT * FROM t1;
 
 DROP TABLE t1;
 
-# Waiting for fix to BUG#22694
-#UNINSTALL PLUGIN example;
-#UNINSTALL PLUGIN EXAMPLE;
+UNINSTALL PLUGIN example;
+--error 1305
+UNINSTALL PLUGIN EXAMPLE;
 
 --error 1305
 UNINSTALL PLUGIN non_exist;
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 17532d2345f..a4fb488a3d6 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -426,6 +426,23 @@
    fun:_dl_map_object
 }
 
+{
+   libc pthread_exit 6
+   Memcheck:Leak
+   fun:malloc
+   fun:_dl_map_object
+   fun:openaux
+   fun:_dl_catch_error 
+}
+
+{
+   libc pthread_exit 7
+   Memcheck:Leak
+   fun:malloc
+   fun:dl_open_worker
+   fun:_dl_catch_error
+   fun:_dl_open
+}
 
 #
 # This is seen internally in the system libraries on 64-bit RHAS3.