From f6d226f5f77cd5b45fe54d2125018fee15e5ffcc Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sat, 7 Aug 2010 19:08:59 +0300 Subject: [PATCH] Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not valgrind debug libraries --- storage/innodb_plugin/include/univ.i | 2 +- storage/xtradb/include/univ.i | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i index b8e595161b9..ff62c3e53c1 100644 --- a/storage/innodb_plugin/include/univ.i +++ b/storage/innodb_plugin/include/univ.i @@ -165,7 +165,7 @@ command. Not tested on Windows. */ #define UNIV_COMPILE_TEST_FUNCS */ -#if defined HAVE_VALGRIND +#if defined(HAVE_valgrind)&& defined(HAVE_VALGRIND_MEMCHECK_H) # define UNIV_DEBUG_VALGRIND #endif /* HAVE_VALGRIND */ #if 0 diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 834428e652f..90ce618b9da 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -168,7 +168,7 @@ command. Not tested on Windows. */ #define UNIV_COMPILE_TEST_FUNCS */ -#ifdef HAVE_valgrind +#if defined(HAVE_valgrind)&& defined(HAVE_VALGRIND_MEMCHECK_H) # define UNIV_DEBUG_VALGRIND #endif /* HAVE_valgrind */ #if 0