diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-28 12:22:12 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-28 12:22:12 +0200 |
commit | f124d71ab75e0d449eb80fb909fa3b0ac4b191a8 (patch) | |
tree | a6010459a3de786763cc80dec02e268cd88be783 /storage/innobase/include | |
parent | 091ac533497cb569df18c11323d31cf468712f6f (diff) | |
parent | fdc582fd983206ef9da531cc3e617fbf4db324d6 (diff) | |
download | mariadb-git-f124d71ab75e0d449eb80fb909fa3b0ac4b191a8.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/include')
-rw-r--r-- | storage/innobase/include/univ.i | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 1c35238e348..7ff8eb56068 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -101,15 +101,6 @@ HAVE_PSI_INTERFACE is defined. */ # define UNIV_PFS_MEMORY # endif /* HAVE_PSI_MEMORY_INTERFACE */ -/* There are mutexes/rwlocks that we want to exclude from -instrumentation even if their corresponding performance schema -define is set. And this PFS_NOT_INSTRUMENTED is used -as the key value to identify those objects that would -be excluded from instrumentation. */ -# define PFS_NOT_INSTRUMENTED ULINT32_UNDEFINED - -# define PFS_IS_INSTRUMENTED(key) ((key) != PFS_NOT_INSTRUMENTED) - #ifdef HAVE_PFS_THREAD_PROVIDER_H /* For PSI_MUTEX_CALL() and similar. */ #include "pfs_thread_provider.h" |