summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-09-27 18:34:36 +0200
committermsvensson@neptunus.(none) <>2006-09-27 18:34:36 +0200
commit660c962bd3645fcd8c561eeaae9f36df30ddb60a (patch)
tree6409e50276e88130a770a1b2225b199e36dc19d2
parentdc1ec664ce12cd9d99f1cc0da648fe63fba2d207 (diff)
parent281b7ad19d18d32893c5eae70216c9946189e2b5 (diff)
downloadmariadb-git-660c962bd3645fcd8c561eeaae9f36df30ddb60a.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into neptunus.(none):/home/msvensson/mysql/work/my51-work
-rw-r--r--mysql-test/valgrind.supp23
1 files changed, 21 insertions, 2 deletions
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 6dd11df5de6..e88df49a707 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -15,11 +15,12 @@
}
{
- pthread allocate_tls memory loss 2
+ pthread allocate_tls memory loss
Memcheck:Leak
fun:calloc
fun:_dl_allocate_tls
- fun:pthread_create@@GLIBC_2.1
+ fun:pthread_create*
+
}
{
@@ -183,6 +184,24 @@
}
{
+ libz longest_match 3
+ Memcheck:Cond
+ fun:longest_match
+ fun:deflate_slow
+ fun:deflate
+ fun:gzclose
+}
+
+{
+ libz longest_match 4
+ Memcheck:Cond
+ fun:longest_match
+ fun:deflate_slow
+ fun:deflate
+ fun:gzflush
+}
+
+{
libz longest_match3
Memcheck:Cond
fun:longest_match