diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /storage/innobase/include/hash0hash.h | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'storage/innobase/include/hash0hash.h')
| -rw-r--r-- | storage/innobase/include/hash0hash.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h index 1c19ea53a23..6f9a628df5d 100644 --- a/storage/innobase/include/hash0hash.h +++ b/storage/innobase/include/hash0hash.h @@ -33,8 +33,8 @@ Created 5/20/1997 Heikki Tuuri # include "sync0rw.h" #endif /* !UNIV_HOTBACKUP */ -typedef struct hash_table_struct hash_table_t; -typedef struct hash_cell_struct hash_cell_t; +struct hash_table_t; +struct hash_cell_t; typedef void* hash_node_t; @@ -382,7 +382,7 @@ hash_get_heap( Gets the nth mutex in a hash table. @return mutex */ UNIV_INLINE -mutex_t* +ib_mutex_t* hash_get_nth_mutex( /*===============*/ hash_table_t* table, /*!< in: hash table */ @@ -400,7 +400,7 @@ hash_get_nth_lock( Gets the mutex for a fold value in a hash table. @return mutex */ UNIV_INLINE -mutex_t* +ib_mutex_t* hash_get_mutex( /*===========*/ hash_table_t* table, /*!< in: hash table */ @@ -451,7 +451,7 @@ void hash_mutex_exit_all_but( /*====================*/ hash_table_t* table, /*!< in: hash table */ - mutex_t* keep_mutex); /*!< in: mutex to keep */ + ib_mutex_t* keep_mutex); /*!< in: mutex to keep */ /************************************************************//** s-lock a lock for a fold value in a hash table. */ UNIV_INTERN @@ -524,12 +524,12 @@ hash_unlock_x_all_but( # define hash_unlock_x_all_but(t, l) ((void) 0) #endif /* !UNIV_HOTBACKUP */ -struct hash_cell_struct{ +struct hash_cell_t{ void* node; /*!< hash chain node, NULL if none */ }; /* The hash table structure */ -struct hash_table_struct { +struct hash_table_t { enum hash_table_sync_t type; /*<! type of hash_table. */ #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG # ifndef UNIV_HOTBACKUP @@ -547,7 +547,7 @@ struct hash_table_struct { rw_locks depending on the type. Must be a power of 2 */ union { - mutex_t* mutexes;/* NULL, or an array of mutexes + ib_mutex_t* mutexes;/* NULL, or an array of mutexes used to protect segments of the hash table */ rw_lock_t* rw_locks;/* NULL, or an array of rw_lcoks |