#At lp:maria based on revid:monty@askmonty.org-20100807144230-squoibrykoeaccqu 2895 Michael Widenius 2010-08-07 Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not valgrind debug libraries modified: storage/innodb_plugin/include/univ.i storage/xtradb/include/univ.i === modified file 'storage/innodb_plugin/include/univ.i' --- a/storage/innodb_plugin/include/univ.i 2010-06-22 16:30:43 +0000 +++ b/storage/innodb_plugin/include/univ.i 2010-08-07 16:08:59 +0000 @@ -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 === modified file 'storage/xtradb/include/univ.i' --- a/storage/xtradb/include/univ.i 2010-08-04 08:39:53 +0000 +++ b/storage/xtradb/include/univ.i 2010-08-07 16:08:59 +0000 @@ -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