diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
| commit | 496d0372ef2ff2a570c20923af4df32a03781acd (patch) | |
| tree | c15d45eeff0fbbfe6112816a72e10352551269ee /storage/innobase/include/gis0rtree.h | |
| parent | d4da131cff004e4157b755e417c49daef45ca80e (diff) | |
| parent | 5ba2aa1ddc074dc89db7f265ddb61ce96f714fc8 (diff) | |
| download | mariadb-git-496d0372ef2ff2a570c20923af4df32a03781acd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include/gis0rtree.h')
| -rw-r--r-- | storage/innobase/include/gis0rtree.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h index 66929348c36..4bf1b4fedb7 100644 --- a/storage/innobase/include/gis0rtree.h +++ b/storage/innobase/include/gis0rtree.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2018, MariaDB Corporation. +Copyright (c) 2017, 2020, 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 @@ -162,22 +162,6 @@ rtr_ins_enlarge_mbr( btr_cur_t* cursor, /*!< in: btr cursor */ mtr_t* mtr); /*!< in: mtr */ -/********************************************************************//** -*/ -void -rtr_get_father_node( -/*================*/ - dict_index_t* index, /*!< in: index */ - ulint level, /*!< in: the tree level of search */ - const dtuple_t* tuple, /*!< in: data tuple; NOTE: n_fields_cmp in - tuple must be set so that it cannot get - compared to the node ptr page number field! */ - btr_cur_t* sea_cur,/*!< in: search cursor */ - btr_cur_t* cursor, /*!< in/out: tree cursor; the cursor page is - s- or x-latched */ - ulint page_no,/*!< in: current page no */ - mtr_t* mtr); /*!< in: mtr */ - /**************************************************************//** push a nonleaf index node to the search path */ UNIV_INLINE |