diff options
| author | Daniel Black <danielgb@au.ibm.com> | 2018-02-25 15:25:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 15:25:54 +1100 |
| commit | 0805a9565f09a36104a420d9e229e44b1eea8879 (patch) | |
| tree | 5c5dbf942479c2b7349f1b4505768ddf5a2f8b8d /storage/innobase/include/sync0sync.h | |
| parent | 3188131b15c26509e4df3c4b15972d07a20be8bd (diff) | |
| parent | 8936b175106a3fdfc560e9d33aa58a6372084c5f (diff) | |
| download | mariadb-git-0805a9565f09a36104a420d9e229e44b1eea8879.tar.gz | |
Merge branch '10.3' into 10.2-MDEV-10814-dont-dump-query-cache
Diffstat (limited to 'storage/innobase/include/sync0sync.h')
| -rw-r--r-- | storage/innobase/include/sync0sync.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h index aed8f769716..0d813b6bd87 100644 --- a/storage/innobase/include/sync0sync.h +++ b/storage/innobase/include/sync0sync.h @@ -93,9 +93,6 @@ extern mysql_pfs_key_t rw_lock_mutex_key; extern mysql_pfs_key_t srv_innodb_monitor_mutex_key; extern mysql_pfs_key_t srv_misc_tmpfile_mutex_key; extern mysql_pfs_key_t srv_monitor_file_mutex_key; -# ifdef UNIV_DEBUG -extern mysql_pfs_key_t sync_thread_mutex_key; -# endif /* UNIV_DEBUG */ extern mysql_pfs_key_t buf_dblwr_mutex_key; extern mysql_pfs_key_t trx_undo_mutex_key; extern mysql_pfs_key_t trx_mutex_key; @@ -112,6 +109,7 @@ extern mysql_pfs_key_t sync_array_mutex_key; extern mysql_pfs_key_t thread_mutex_key; extern mysql_pfs_key_t zip_pad_mutex_key; extern mysql_pfs_key_t row_drop_list_mutex_key; +extern mysql_pfs_key_t rw_trx_hash_element_mutex_key; #endif /* UNIV_PFS_MUTEX */ #ifdef UNIV_PFS_RWLOCK |