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/lock0priv.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/lock0priv.h')
| -rw-r--r-- | storage/innobase/include/lock0priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h index 226c9f84cbb..aa1cb964e53 100644 --- a/storage/innobase/include/lock0priv.h +++ b/storage/innobase/include/lock0priv.h @@ -629,7 +629,7 @@ inline void lock_set_lock_and_trx_wait(lock_t* lock, trx_t* trx) ut_ad(lock); ut_ad(lock->trx == trx); ut_ad(trx->lock.wait_lock == NULL); - mysql_mutex_assert_owner(&lock_sys.mutex); + lock_sys.mutex_assert_locked(); trx->lock.wait_lock = lock; lock->type_mode |= LOCK_WAIT; @@ -640,7 +640,7 @@ inline void lock_set_lock_and_trx_wait(lock_t* lock, trx_t* trx) inline void lock_reset_lock_and_trx_wait(lock_t* lock) { ut_ad(lock_get_wait(lock)); - mysql_mutex_assert_owner(&lock_sys.mutex); + lock_sys.mutex_assert_locked(); ut_ad(lock->trx->lock.wait_lock == NULL || lock->trx->lock.wait_lock == lock); lock->trx->lock.wait_lock = NULL; |