diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
| commit | 1813d92d0c505a1c752f4a9d6e37db6bffe4efdd (patch) | |
| tree | f570314890197949ae55cbbad3a94eb5893c4177 /storage/innobase/include/srv0mon.h | |
| parent | 0fe97c20b341665058491fca4d665207406775c6 (diff) | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| download | mariadb-git-1813d92d0c505a1c752f4a9d6e37db6bffe4efdd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include/srv0mon.h')
| -rw-r--r-- | storage/innobase/include/srv0mon.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h index 8f497fa9f44..8e833642ee0 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -2,7 +2,7 @@ Copyright (c) 2010, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -651,14 +651,14 @@ Use MONITOR_DEC if appropriate mutex protection exists. } \ } -#ifdef UNIV_DEBUG_VALGRIND +#ifdef HAVE_valgrind_or_MSAN # define MONITOR_CHECK_DEFINED(value) do { \ mon_type_t m = value; \ - UNIV_MEM_ASSERT_RW(&m, sizeof m); \ + MEM_CHECK_DEFINED(&m, sizeof m); \ } while (0) -#else /* UNIV_DEBUG_VALGRIND */ +#else /* HAVE_valgrind_or_MSAN */ # define MONITOR_CHECK_DEFINED(value) (void) 0 -#endif /* UNIV_DEBUG_VALGRIND */ +#endif /* HAVE_valgrind_or_MSAN */ #define MONITOR_INC_VALUE(monitor, value) \ MONITOR_CHECK_DEFINED(value); \ |