Skip to content

M
MariaDB
Commit 5b5bce81 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.0 into 10.1

parents 5044dae2 833fda8f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
storage/innobase/include/univ.i
View file @ 5b5bce81
/*****************************************************************************
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
......
storage/xtradb/include/univ.i
View file @ 5b5bce81
/*****************************************************************************
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7