diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:19:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:19:06 +0200 |
| commit | 5b5bce81e6829677792fc1940691def8602f8dcd (patch) | |
| tree | c6e2c5dee44cd2178c0c7a8371413e907b755c5f /storage | |
| parent | 5044dae239d094582879792de7a762d3428223ce (diff) | |
| parent | 833fda8f1a0c415ced1f2b8c1851809383bcc639 (diff) | |
| download | mariadb-git-5b5bce81e6829677792fc1940691def8602f8dcd.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage')
| -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 81190c3ad2e..1a5004549b9 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. Copyright (c) 2013, 2015, MariaDB Corporation. @@ -172,7 +173,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 08236889556..e3c79e9b826 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. Copyright (c) 2013, 2015, MariaDB Corporation. @@ -184,7 +185,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 |