summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-07 19:08:59 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-07 19:08:59 +0300
commitf6d226f5f77cd5b45fe54d2125018fee15e5ffcc (patch)
treed049c8b08e55f0bdb10d22252d5854b8eea5c700
parent0d3039d49daa7e274d66db808b15eebe8cbd778e (diff)
downloadmariadb-git-f6d226f5f77cd5b45fe54d2125018fee15e5ffcc.tar.gz
Ensure that xtradb & InnoDB plugin compiles if valgrind is installed but not valgrind debug libraries
-rw-r--r--storage/innodb_plugin/include/univ.i2
-rw-r--r--storage/xtradb/include/univ.i2
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