diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-04 19:02:58 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-15 17:56:18 +0200 |
commit | ff5d306e296350e7489dd3decb01bad18d135411 (patch) | |
tree | 64e8673307ede8bf633e94947ed84e3dcaaa5b05 /storage/innobase/include/dict0types.h | |
parent | db006a9a43b6e68c4b92d2762043fa76b313623c (diff) | |
download | mariadb-git-ff5d306e296350e7489dd3decb01bad18d135411.tar.gz |
MDEV-21452: Replace ib_mutex_t with mysql_mutex_t
SHOW ENGINE INNODB MUTEX functionality is completely removed,
as are the InnoDB latching order checks.
We will enforce innodb_fatal_semaphore_wait_threshold
only for dict_sys.mutex and lock_sys.mutex.
dict_sys_t::mutex_lock(): A single entry point for dict_sys.mutex.
lock_sys_t::mutex_lock(): A single entry point for lock_sys.mutex.
FIXME: srv_sys should be removed altogether; it is duplicating tpool
functionality.
fil_crypt_threads_init(): To prevent SAFE_MUTEX warnings, we must
not hold fil_system.mutex.
fil_close_all_files(): To prevent SAFE_MUTEX warnings for
fil_space_destroy_crypt_data(), we must not hold fil_system.mutex
while invoking fil_space_free_low() on a detached tablespace.
Diffstat (limited to 'storage/innobase/include/dict0types.h')
-rw-r--r-- | storage/innobase/include/dict0types.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h index d0da45ab218..6db0f3ba65b 100644 --- a/storage/innobase/include/dict0types.h +++ b/storage/innobase/include/dict0types.h @@ -27,7 +27,7 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0types_h #define dict0types_h -#include <ut0mutex.h> +#include "univ.i" #include <rem0types.h> struct dict_col_t; @@ -90,10 +90,6 @@ enum ib_quiesce_t { QUIESCE_COMPLETE /*!< All done */ }; -#ifndef UNIV_INNOCHECKSUM -typedef ib_mutex_t DictSysMutex; -#endif /* !UNIV_INNOCHECKSUM */ - /** Prefix for tmp tables, adopted from sql/table.h */ #define TEMP_FILE_PREFIX "#sql" #define TEMP_FILE_PREFIX_LENGTH 4 |