diff options
| author | monty@mashka.mysql.fi <> | 2003-01-18 03:13:37 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-18 03:13:37 +0200 |
| commit | 76f146a17551e218727ee4a5544edb62d3cbe56e (patch) | |
| tree | b24bce166fd5affbcc506bbc7d70c2c7ef00f561 /innobase/include | |
| parent | 1b03f007101aa5123a7e55add3db5139a47bddc6 (diff) | |
| parent | c1d614192ee6930aed50f0cf64bf60abf6c1acb0 (diff) | |
| download | mariadb-git-76f146a17551e218727ee4a5544edb62d3cbe56e.tar.gz | |
Merge with 4.0.9
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/btr0btr.h | 9 | ||||
| -rw-r--r-- | innobase/include/btr0cur.h | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/innobase/include/btr0btr.h b/innobase/include/btr0btr.h index 3cd44ab5175..8606fcd2a5c 100644 --- a/innobase/include/btr0btr.h +++ b/innobase/include/btr0btr.h @@ -56,6 +56,15 @@ insert buffer to speed up inserts */ #define BTR_IGNORE_SEC_UNIQUE 2048 /****************************************************************** +Gets the root node of a tree and x-latches it. */ + +page_t* +btr_root_get( +/*=========*/ + /* out: root page, x-latched */ + dict_tree_t* tree, /* in: index tree */ + mtr_t* mtr); /* in: mtr */ +/****************************************************************** Gets a buffer page and declares its latching order level. */ UNIV_INLINE page_t* diff --git a/innobase/include/btr0cur.h b/innobase/include/btr0cur.h index 7039ceba245..1d17c0e952d 100644 --- a/innobase/include/btr0cur.h +++ b/innobase/include/btr0cur.h @@ -507,7 +507,13 @@ void btr_free_externally_stored_field( /*=============================*/ dict_index_t* index, /* in: index of the data, the index - tree MUST be X-latched */ + tree MUST be X-latched; if the tree + height is 1, then also the root page + must be X-latched! (this is relevant + in the case this function is called + from purge where 'data' is located on + an undo log page, not an index + page) */ byte* data, /* in: internally stored data + reference to the externally stored part */ |