diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:27:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-11 14:27:24 +0200 |
| commit | fd0479ce592e0b7c13d67b5deda62e9090956309 (patch) | |
| tree | 4ea4b0bf06d4a7f1a4f1905239f68251f95a2579 | |
| parent | 5f0c31f928338e8a6ffde098b7ffd3d1a8b02903 (diff) | |
| parent | 4507f1e5d4fbfc2a638417683fc71d1768729cac (diff) | |
| download | mariadb-git-fd0479ce592e0b7c13d67b5deda62e9090956309.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | storage/innobase/include/univ.i | 4 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index f877eedf551..35ea9fd51be 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -1,8 +1,8 @@ /***************************************************************************** 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, 2016, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -184,7 +184,7 @@ command. */ #define UNIV_ENABLE_UNIT_TEST_ROW_RAW_FORMAT_INT */ -#if defined HAVE_VALGRIND +#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..ad0565a0290 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -1,8 +1,8 @@ /***************************************************************************** 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. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -184,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 |