backport valgrind cleanups from 6.0-engines

2 files changed, 16 insertions, 3 deletions

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index a4fb488a3d6..cb1b07c83b0 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -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:*/libdl-*.so
+   fun:dlopen*
+}
+
diff --git a/strings/strmake.c b/strings/strmake.c
index df8d78e8476..2d5fa5e36aa 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -41,9 +41,9 @@ char *strmake(register char *dst, register const char *src, size_t length)
     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--)