MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:May 21 2007 12:48pm
Subject:bk commit into 5.1 tree (svoj:1.2523) BUG#25659
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-21 17:48:29+05:00, svoj@stripped +4 -0
  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>

  mysql-test/lib/mtr_io.pl@stripped, 2007-05-21 17:48:28+05:00, svoj@stripped +5 -1
    Do not pass empty string since my_getopt is not capable to handle it.
    This is required to make plugin.test work on platforms where
    ha_example is not compiled.

  mysql-test/r/plugin.result@stripped, 2007-05-21 17:48:28+05:00, svoj@stripped +3 -0
    Updated test result.

  mysql-test/t/plugin.test@stripped, 2007-05-21 17:48:28+05:00, svoj@stripped +3 -3
    Re-enabled UNINSTALL PLUGIN statement. It is a good idea to cleanup
    at the end of the test. Anyway bug22694 was fixed while this test
    was disabled.

  mysql-test/valgrind.supp@stripped, 2007-05-21 17:48:28+05:00, svoj@stripped +17 -0
    Added suppressions for dlopen to make plugin test pass.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines

--- 1.12/mysql-test/lib/mtr_io.pl	2006-12-31 04:06:32 +04:00
+++ 1.13/mysql-test/lib/mtr_io.pl	2007-05-21 17:48:28 +05:00
@@ -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;

--- 1.17/mysql-test/valgrind.supp	2007-03-01 15:14:46 +04:00
+++ 1.18/mysql-test/valgrind.supp	2007-05-21 17:48:28 +05:00
@@ -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.

--- 1.2/mysql-test/r/plugin.result	2007-05-18 16:23:44 +05:00
+++ 1.3/mysql-test/r/plugin.result	2007-05-21 17:48:28 +05:00
@@ -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

--- 1.1/mysql-test/t/plugin.test	2006-12-15 03:09:53 +04:00
+++ 1.2/mysql-test/t/plugin.test	2007-05-21 17:48:28 +05:00
@@ -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;
Thread
bk commit into 5.1 tree (svoj:1.2523) BUG#25659Sergey Vojtovich21 May