diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
| commit | 7b2bb67113bdda470955e3d4d72be0f2c0b38902 (patch) | |
| tree | 9f9f34da1a4e48c243c56ff161987074ef907cbb /storage/innobase/include/btr0btr.h | |
| parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
| parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
| download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/btr0btr.h')
| -rw-r--r-- | storage/innobase/include/btr0btr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index 29382bb033f..fe845005536 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -214,7 +214,7 @@ the index. ulint btr_height_get( /*===========*/ - dict_index_t* index, /*!< in: index tree */ + const dict_index_t* index, /*!< in: index tree */ mtr_t* mtr) /*!< in/out: mini-transaction */ MY_ATTRIBUTE((warn_unused_result)); @@ -592,7 +592,7 @@ Gets the number of pages in a B-tree. ulint btr_get_size( /*=========*/ - dict_index_t* index, /*!< in: index */ + const dict_index_t* index, /*!< in: index */ ulint flag, /*!< in: BTR_N_LEAF_PAGES or BTR_TOTAL_SIZE */ mtr_t* mtr) /*!< in/out: mini-transaction where index is s-latched */ |