Merge 10.0 into 10.1

5b5bce81 · Marko Mäkelä · 5044dae2 · 833fda8f · 5b5bce81 · 5b5bce81
Commit 5b5bce81 authored Jan 11, 2017 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

storage/innobase/include/univ.i storage/innobase/include/univ.i +2 -1

storage/xtradb/include/univ.i storage/xtradb/include/univ.i +2 -1

No files found.
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
 /*****************************************************************************

 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

--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
 /*****************************************************************************

 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