MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GLOBAL SYMBOLS TO STATIC

InnoDB defines some functions that are not called at all.
Other functions are called, but only from the same compilation unit.

Remove some function declarations and definitions, and add 'static'
keywords. Some symbols must be kept for separately compiled tools,
such as innochecksum.

1 files changed, 0 insertions, 35 deletions

diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h
index 37faa4eb903..65a53ec1d39 100644
--- a/storage/innobase/include/gis0rtree.h
+++ b/storage/innobase/include/gis0rtree.h
@@ -143,20 +143,6 @@ rtr_pcur_move_to_next(
 				/*!< in: current level */
 	mtr_t*		mtr);	/*!< in: mtr */
 
-/**************************************************************//**
-Restores the stored position of a persistent cursor bufferfixing the page */
-bool
-rtr_cur_restore_position_func(
-/*==========================*/
-	ulint		latch_mode,	/*!< in: BTR_SEARCH_LEAF, ... */
-	btr_cur_t*	cursor,		/*!< in: detached persistent cursor */
-	ulint		level,		/*!< in: index level */
-	const char*	file,		/*!< in: file name */
-	unsigned	line,		/*!< in: line where called */
-	mtr_t*		mtr);		/*!< in: mtr */
-#define rtr_cur_restore_position(l,cur,level,mtr)		\
-	rtr_cur_restore_position_func(l,cur,level,__FILE__,__LINE__,mtr)
-
 /****************************************************************//**
 Searches the right position in rtree for a page cursor. */
 bool
@@ -318,9 +304,6 @@ rtr_get_mbr_from_tuple(
 	const dtuple_t*	dtuple,	/*!< in: data tuple */
 	rtr_mbr*	mbr);	/*!< out: mbr to fill */
 
-#define rtr_page_get_father_node_ptr(of,heap,sea,cur,mtr)		\
-	rtr_page_get_father_node_ptr_func(of,heap,sea,cur,__FILE__,__LINE__,mtr)
-
 /* Get the rtree page father.
 @param[in]	offsets		work area for the return value
 @param[in]	index		rtree index
@@ -339,24 +322,6 @@ rtr_page_get_father(
 	btr_cur_t*	cursor);
 
 /************************************************************//**
-Returns the upper level node pointer to a R-Tree page. It is assumed
-that mtr holds an x-latch on the tree.
-@return rec_get_offsets() of the node pointer record */
-ulint*
-rtr_page_get_father_node_ptr_func(
-/*==============================*/
-	ulint*		offsets,/*!< in: work area for the return value */
-	mem_heap_t*	heap,	/*!< in: memory heap to use */
-	btr_cur_t*	sea_cur,/*!< in: search cursor */
-	btr_cur_t*	cursor,	/*!< in: cursor pointing to user record,
-				out: cursor on node pointer record,
-				its page x-latched */
-	const char*	file,	/*!< in: file name */
-	unsigned	line,	/*!< in: line where called */
-	mtr_t*		mtr);	/*!< in: mtr */
-
-
-/************************************************************//**
 Returns the father block to a page. It is assumed that mtr holds
 an X or SX latch on the tree.
 @return rec_get_offsets() of the node pointer record */