diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-10-19 14:16:15 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-10-19 14:16:15 +0200 |
commit | c6ccd3f34693198883d905b98638db49ea6e6a76 (patch) | |
tree | ca49772d376816b7d08173489e9eae4447eef0d7 /storage/xtradb/include/btr0sea.h | |
parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
parent | 4f907dc75b44bca9d9f3c293e7ada0911645837d (diff) | |
download | mariadb-git-c6ccd3f34693198883d905b98638db49ea6e6a76.tar.gz |
Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/btr0sea.h')
-rw-r--r-- | storage/xtradb/include/btr0sea.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/storage/xtradb/include/btr0sea.h b/storage/xtradb/include/btr0sea.h index 7f4842d0897..f6d194319ae 100644 --- a/storage/xtradb/include/btr0sea.h +++ b/storage/xtradb/include/btr0sea.h @@ -187,6 +187,7 @@ btr_search_update_hash_on_delete( btr_cur_t* cursor);/*!< in: cursor which was positioned on the record to delete using btr_cur_search_..., the record is not yet deleted */ +#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG /********************************************************************//** Validates the search system. @return TRUE if ok */ @@ -194,10 +195,19 @@ UNIV_INTERN ibool btr_search_validate(void); /*======================*/ +#else +# define btr_search_validate() TRUE +#endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */ /** Flag: has the search system been enabled? Protected by btr_search_latch and btr_search_enabled_mutex. */ -extern char btr_search_enabled; +extern char btr_search_enabled; + +/** Flag: whether the search system has completed its disabling process, +It is set to TRUE right after buf_pool_drop_hash_index() in +btr_search_disable(), indicating hash index entries are cleaned up. +Protected by btr_search_latch and btr_search_enabled_mutex. */ +extern ibool btr_search_fully_disabled; /** The search info struct in an index */ struct btr_search_struct{ |