bk commit into 6.0 tree (acurtis:1.2569)

[antony]

Below is the list of changes that have just been committed into a local
6.0 repository of acurtis.  When acurtis 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, 2008-02-18 04:16:19-08:00, acurtis@stripped +3 -0
  Fix valgrind warnings

  mysql-test/suite/parts/t/disabled.def@stripped, 2008-02-18 04:16:02-08:00, acurtis@stripped +0 -7
    Enabed tests related to bug34225

  mysql-test/valgrind.supp@stripped, 2008-02-18 04:16:02-08:00, acurtis@stripped +13 -0
    Suppress warnings related to a memory leak in glib threaded dlopen() implementation

  strings/strmake.c@stripped, 2008-02-18 04:16:02-08:00, acurtis@stripped +3 -3
    strlen() causes valgrind warning if original string was not NUL terminated.

diff -Nrup a/mysql-test/suite/parts/t/disabled.def b/mysql-test/suite/parts/t/disabled.def
--- a/mysql-test/suite/parts/t/disabled.def	2008-02-01 23:15:27 -08:00
+++ b/mysql-test/suite/parts/t/disabled.def	2008-02-18 04:16:02 -08:00
@@ -7,17 +7,10 @@ part_supported_sql_func_ndb    : cannot 
 partition_alter1_ndb           : timeout. Needs too much time.
 partition_alter2_ndb           : cannot create t1
 partition_basic_ndb            : cannot create t1
-partition_bit_myisam           : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
 partition_bit_ndb              : cannot create t1
-partition_char_myisam          : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
-partition_datetime_myisam      : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
-partition_decimal_myisam       : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
 partition_engine_ndb           : cannot create t1
-partition_float_myisam         : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
-partition_int_myisam           : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
 partition_int_ndb              : cannot create t1
 partition_sessions             : needs system_3_init.inc
-partition_special_myisam       : BUG#34225 2008-02-02 mats test suit parts uses /tmp-dir instead of mysql-test dir, which causes failures
 partition_syntax_ndb           : cannot create t1
 partition_value_innodb         : Bug#30581 partition_value tests use disallowed CAST() function
 partition_value_myisam         : Bug#30581 partition_value tests use disallowed CAST() function
diff -Nrup a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
--- a/mysql-test/valgrind.supp	2007-05-21 05:48:28 -07:00
+++ b/mysql-test/valgrind.supp	2008-02-18 04:16:02 -08:00
@@ -495,3 +495,16 @@
    fun:_db_enter_
    fun:kill_server
 }
+
+#
+# Warning caused by small memory leak in threaded dlopen
+#
+
+{
+   dlopen threaded memory leak
+   Memcheck:Leak
+   fun:calloc
+   obj:/lib64/libdl-*.so
+   fun:dlopen
+}
+
diff -Nrup a/strings/strmake.c b/strings/strmake.c
--- a/strings/strmake.c	2007-12-17 01:43:18 -08:00
+++ b/strings/strmake.c	2008-02-18 04:16:02 -08:00
@@ -41,9 +41,9 @@ char *strmake(register char *dst, regist
     write a character rather than '\0' as this makes spotting these
     problems in the results easier.
   */
-  uint n= strlen(src) + 1;
-  if (n <= length)
-    memset(dst + n, (int) 'Z', length - n + 1);
+  uint n= 0;
+  while (n < length && src[n++]);
+  memset(dst + n, (int) 'Z', length - n + 1);
 #endif
 
   while (length--)