diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:13:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:13:30 +0200 |
| commit | 833fda8f1a0c415ced1f2b8c1851809383bcc639 (patch) | |
| tree | 250374d194476d999f79e23820b39a9ab5e64b85 | |
| parent | f516db3500c0c20ff119203308cfc95e8752d62d (diff) | |
| download | mariadb-git-833fda8f1a0c415ced1f2b8c1851809383bcc639.tar.gz | |
InnoDB: Enable UNIV_DEBUG_VALGRIND for cmake -DWITH_VALGRIND
The symbol HAVE_VALGRIND_MEMCHECK_H was never defined.
Instead, the symbol HAVE_VALGRIND should have been used.
| -rw-r--r-- | storage/innobase/include/univ.i | 3 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index e6ddf45faba..7b867edfb22 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2013, 2017, MariaDB Corporation. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -171,7 +172,7 @@ command. Not tested on Windows. */ #define UNIV_COMPILE_TEST_FUNCS */ -#if defined(HAVE_valgrind)&& defined(HAVE_VALGRIND_MEMCHECK_H) +#if defined HAVE_valgrind && defined HAVE_VALGRIND # define UNIV_DEBUG_VALGRIND #endif /* HAVE_VALGRIND */ #if 0 diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 397843d309c..3444cbb1e7f 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2013, 2017, MariaDB Corporation. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -183,7 +184,7 @@ command. Not tested on Windows. */ #define UNIV_COMPILE_TEST_FUNCS */ -#if defined(HAVE_valgrind)&& defined(HAVE_VALGRIND_MEMCHECK_H) +#if defined HAVE_valgrind && defined HAVE_VALGRIND # define UNIV_DEBUG_VALGRIND #endif #if 0 |