diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-17 14:32:53 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-17 14:32:53 +0300 |
commit | 5fd7502e7797ecc9e9c5b5dbe35874c18839440c (patch) | |
tree | 4aa4e0116e5ac7566e636507916f62dffcdc0b01 /storage/innobase/include/dict0priv.ic | |
parent | d682dc2e709c22bdd6012295b55d3908fe6c546d (diff) | |
download | mariadb-git-5fd7502e7797ecc9e9c5b5dbe35874c18839440c.tar.gz |
MDEV-19513: Allocate dict_sys statically
dict_sys_t::create(): Renamed from dict_init().
dict_sys_t::close(): Renamed from dict_close().
dict_sys_t::add(): Sliced from dict_table_t::add_to_cache().
dict_sys_t::remove(): Renamed from dict_table_remove_from_cache().
dict_sys_t::prevent_eviction(): Renamed from
dict_table_move_from_lru_to_non_lru().
dict_sys_t::acquire(): Replaces dict_move_to_mru() and some more logic.
dict_sys_t::resize(): Renamed from dict_resize().
dict_sys_t::find(): Replaces dict_lru_find_table() and
dict_non_lru_find_table().
Diffstat (limited to 'storage/innobase/include/dict0priv.ic')
-rw-r--r-- | storage/innobase/include/dict0priv.ic | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/dict0priv.ic b/storage/innobase/include/dict0priv.ic index 6d7fbf07394..6ce678b6c3a 100644 --- a/storage/innobase/include/dict0priv.ic +++ b/storage/innobase/include/dict0priv.ic @@ -39,7 +39,7 @@ dict_table_get_low( dict_table_t* table; ut_ad(table_name); - ut_ad(mutex_own(&dict_sys->mutex)); + ut_ad(mutex_own(&dict_sys.mutex)); table = dict_table_check_if_in_cache_low(table_name); @@ -79,12 +79,12 @@ dict_table_check_if_in_cache_low( ("table: '%s'", table_name)); ut_ad(table_name); - ut_ad(mutex_own(&dict_sys->mutex)); + ut_ad(mutex_own(&dict_sys.mutex)); /* Look for the table name in the hash table */ table_fold = ut_fold_string(table_name); - HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold, + HASH_SEARCH(name_hash, dict_sys.table_hash, table_fold, dict_table_t*, table, ut_ad(table->cached), !strcmp(table->name.m_name, table_name)); DBUG_RETURN(table); |