From 6af588d8202705a3b6db6d6f9ffa4c87867d9a5b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 1 Feb 2012 15:33:37 +0100 Subject: [PATCH] disable sys_vars.innodb_use_sys_malloc_basic test for valgrind runs --- .../suite/sys_vars/r/innodb_use_sys_malloc_basic.result | 3 --- mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result index 0c2685b1a49..70ecef72042 100644 --- a/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result @@ -1,7 +1,4 @@ Valid values are 'ON' and 'OFF' -select @@global.innodb_adaptive_flushing in (0, 1); -@@global.innodb_adaptive_flushing in (0, 1) -1 select @@global.innodb_use_sys_malloc; @@global.innodb_use_sys_malloc 1 diff --git a/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test index 21f3e904547..699773f4a62 100644 --- a/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test @@ -5,11 +5,14 @@ --source include/have_innodb.inc +# when running with valgring, mtr uses --innodb-use-sys-malloc=0, +# while below we want to see the default value. +--source include/not_valgrind.inc + # # show the global and session values; # --echo Valid values are 'ON' and 'OFF' -select @@global.innodb_adaptive_flushing in (0, 1); select @@global.innodb_use_sys_malloc; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.innodb_use_sys_malloc;