summaryrefslogtreecommitdiff
path: root/storage/innobase/include/btr0btr.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-10-09 13:25:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-10-09 13:25:11 +0300
commit892378fb9def2cd38db8c1b0adcb66be2f72e86a (patch)
treec012561a43062907d90171878007b02d11412f93 /storage/innobase/include/btr0btr.h
parentf11d425a15e53d4b206146a9d52f5be324247826 (diff)
parentc65cb244b35412ef54192b17120f7ace8a8af5fd (diff)
downloadmariadb-git-892378fb9def2cd38db8c1b0adcb66be2f72e86a.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/btr0btr.h')
-rw-r--r--storage/innobase/include/btr0btr.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
index 6754fb04469..2c808d4bd06 100644
--- a/storage/innobase/include/btr0btr.h
+++ b/storage/innobase/include/btr0btr.h
@@ -520,14 +520,10 @@ btr_insert_on_non_leaf_level_func(
mtr_t* mtr); /*!< in: mtr */
#define btr_insert_on_non_leaf_level(f,i,l,t,m) \
btr_insert_on_non_leaf_level_func(f,i,l,t,__FILE__,__LINE__,m)
-/****************************************************************//**
-Sets a record as the predefined minimum record. */
-void
-btr_set_min_rec_mark(
-/*=================*/
- rec_t* rec, /*!< in/out: record */
- mtr_t* mtr) /*!< in: mtr */
- MY_ATTRIBUTE((nonnull));
+
+/** Sets a record as the predefined minimum record. */
+void btr_set_min_rec_mark(rec_t* rec, mtr_t* mtr) MY_ATTRIBUTE((nonnull));
+
/** Seek to the parent page of a B-tree page.
@param[in,out] index b-tree
@param[in] block child page