summaryrefslogtreecommitdiff
path: root/storage/innobase/include/btr0sea.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-29 16:36:16 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-29 16:52:12 +0300
commit18934fb58309f4491b34273b2781cce68f6d6e22 (patch)
treee9e43e81979561fd5aec9d17dddd5cb6ea02e93f /storage/innobase/include/btr0sea.h
parent8a42ad7a5d3168b7ce92a38652d77424336a32b8 (diff)
parent6aa50bad3947a0eab24fb029cd58f5945439e365 (diff)
downloadmariadb-git-18934fb58309f4491b34273b2781cce68f6d6e22.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/btr0sea.h')
-rw-r--r--storage/innobase/include/btr0sea.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index fad0dac93c4..e6983cacffb 100644
--- a/storage/innobase/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -129,15 +130,10 @@ btr_search_move_or_delete_hash_entries(
void
btr_search_drop_page_hash_index(buf_block_t* block);
-/** Drop any adaptive hash index entries that may point to an index
-page that may be in the buffer pool, when a page is evicted from the
-buffer pool or freed in a file segment.
-@param[in] page_id page id
-@param[in] page_size page size */
-void
-btr_search_drop_page_hash_when_freed(
- const page_id_t& page_id,
- const page_size_t& page_size);
+/** Drop possible adaptive hash index entries when a page is evicted
+from the buffer pool or freed in a file, or the index is being dropped.
+@param[in] page_id page id */
+void btr_search_drop_page_hash_when_freed(const page_id_t& page_id);
/** Updates the page hash index when a single record is inserted on a page.
@param[in] cursor cursor which was positioned to the place to insert