From 1ae43d6ec82c49c0d8c6e417dd664f01e2556a74 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 Sep 2009 09:38:39 +0200 Subject: [PATCH] Don't test innodb-use-sys-malloc under Valgrind. InnoDB does not bother to free explicitly one-time allocations at exit, so we get lots of "still reachable" warnings in Valgrind with innodb-use-sys-malloc enabled. --- mysql-test/suite/innodb/t/innodb-use-sys-malloc.test | 3 +++ mysql-test/t/innodb-use-sys-malloc.test | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test index 4df3ca9d27c..d876969f8f3 100644 --- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test +++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test @@ -1,5 +1,8 @@ --source include/have_innodb.inc -- source suite/innodb/include/have_innodb_plugin.inc +# XtraDB has lots of "still reachable" memory leak warnings at shutdown when +# --innodb-use-sys-malloc +--source include/not_valgrind.inc #display current value of innodb_use_sys_malloc SELECT @@GLOBAL.innodb_use_sys_malloc; diff --git a/mysql-test/t/innodb-use-sys-malloc.test b/mysql-test/t/innodb-use-sys-malloc.test index 9aea0fa30e1..07ccf261713 100644 --- a/mysql-test/t/innodb-use-sys-malloc.test +++ b/mysql-test/t/innodb-use-sys-malloc.test @@ -1,5 +1,5 @@ --source include/have_innodb.inc -# XtraDB has lots of memory leak warnings at shutdown when +# XtraDB has lots of "still reachable" memory leak warnings at shutdown when # --innodb-use-sys-malloc --source include/not_valgrind.inc