diff options
Diffstat (limited to 'storage/innobase/include/btr0sea.h')
-rw-r--r-- | storage/innobase/include/btr0sea.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h index 5316c3efd39..fea117d0aaf 100644 --- a/storage/innobase/include/btr0sea.h +++ b/storage/innobase/include/btr0sea.h @@ -68,7 +68,8 @@ UNIV_INLINE btr_search_t* btr_search_get_info( /*================*/ - dict_index_t* index); /*!< in: index */ + dict_index_t* index) /*!< in: index */ + __attribute__((nonnull)); /*****************************************************************//** Creates and initializes a search info struct. @return own: search info struct */ @@ -193,7 +194,7 @@ btr_search_validate(void); #endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */ /** The search info struct in an index */ -struct btr_search_struct{ +struct btr_search_t{ ulint ref_count; /*!< Number of blocks in this index tree that have search index built i.e. block->index points to this index. @@ -242,16 +243,13 @@ struct btr_search_struct{ #endif /* UNIV_SEARCH_PERF_STAT */ #ifdef UNIV_DEBUG ulint magic_n; /*!< magic number @see BTR_SEARCH_MAGIC_N */ -/** value of btr_search_struct::magic_n, used in assertions */ +/** value of btr_search_t::magic_n, used in assertions */ # define BTR_SEARCH_MAGIC_N 1112765 #endif /* UNIV_DEBUG */ }; /** The hash index system */ -typedef struct btr_search_sys_struct btr_search_sys_t; - -/** The hash index system */ -struct btr_search_sys_struct{ +struct btr_search_sys_t{ hash_table_t* hash_index; /*!< the adaptive hash index, mapping dtuple_fold values to rec_t pointers on index pages */ |