Revert "MDEV-30400 Assertion height == btr_page_get_level(...) on INSERT"

This reverts commit f9cac8d2
which was accidentally pushed prematurely.

mysql-test/suite/innodb/t/innodb_wl6326.opt

+--innodb-sys-tablestats

mysql-test/suite/innodb_gis/r/rtree_split.result

@@ -61,15 +61,3 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 count(*)
 57344
 drop table t1;
-#
-# MDEV-30400 Assertion height == btr_page_get_level ... on INSERT
-#
-CREATE TABLE t1 (c POINT NOT NULL,SPATIAL (c)) ENGINE=InnoDB;
-SET @save_limit=@@GLOBAL.innodb_limit_optimistic_insert_debug;
-SET GLOBAL innodb_limit_optimistic_insert_debug=2;
-BEGIN;
-INSERT INTO t1 SELECT POINTFROMTEXT ('POINT(0 0)') FROM seq_1_to_366;
-ROLLBACK;
-SET GLOBAL innodb_limit_optimistic_insert_debug=@save_limit;
-DROP TABLE t1;
-# End of 10.6 tests

mysql-test/suite/innodb_gis/t/rtree_split.test

@@ -73,18 +73,3 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 
 # Clean up.
 drop table t1;
-
---echo #
---echo # MDEV-30400 Assertion height == btr_page_get_level ... on INSERT
---echo #
-
-CREATE TABLE t1 (c POINT NOT NULL,SPATIAL (c)) ENGINE=InnoDB;
-SET @save_limit=@@GLOBAL.innodb_limit_optimistic_insert_debug;
-SET GLOBAL innodb_limit_optimistic_insert_debug=2;
-BEGIN;
-INSERT INTO t1 SELECT POINTFROMTEXT ('POINT(0 0)') FROM seq_1_to_366;
-ROLLBACK;
-SET GLOBAL innodb_limit_optimistic_insert_debug=@save_limit;
-DROP TABLE t1;
-
---echo # End of 10.6 tests

storage/innobase/btr/btr0defragment.cc

 /*****************************************************************************
 
 Copyright (C) 2012, 2014 Facebook, Inc. All Rights Reserved.
-Copyright (C) 2014, 2023, MariaDB Corporation.
+Copyright (C) 2014, 2022, 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
@@ -280,70 +280,6 @@ btr_defragment_calc_n_recs_for_size(
 	return n_recs;
 }
 
-MY_ATTRIBUTE((nonnull(2,3,4), warn_unused_result))
-/************************************************************//**
-Returns the upper level node pointer to a page. It is assumed that mtr holds
-an sx-latch on the tree.
-@return rec_get_offsets() of the node pointer record */
-static
-rec_offs*
-btr_page_search_father_node_ptr(
-	rec_offs*	offsets,/*!< in: work area for the return value */
-	mem_heap_t*	heap,	/*!< in: memory heap to use */
-	btr_cur_t*	cursor,	/*!< in: cursor pointing to user record,
-				out: cursor on node pointer record,
-				its page x-latched */
-	mtr_t*		mtr)	/*!< in: mtr */
-{
-	const uint32_t page_no = btr_cur_get_block(cursor)->page.id().page_no();
-	dict_index_t* index = btr_cur_get_index(cursor);
-	ut_ad(!index->is_spatial());
-
-	ut_ad(mtr->memo_contains_flagged(&index->lock, MTR_MEMO_X_LOCK
-					 | MTR_MEMO_SX_LOCK));
-	ut_ad(dict_index_get_page(index) != page_no);
-
-	const auto level = btr_page_get_level(btr_cur_get_page(cursor));
-
-	const rec_t* user_rec = btr_cur_get_rec(cursor);
-	ut_a(page_rec_is_user_rec(user_rec));
-
-	if (btr_cur_search_to_nth_level(level + 1,
-					dict_index_build_node_ptr(index,
-								  user_rec, 0,
-								  heap, level),
-					RW_X_LATCH,
-					cursor, mtr) != DB_SUCCESS) {
-		return nullptr;
-	}
-
-	const rec_t* node_ptr = btr_cur_get_rec(cursor);
-	ut_ad(!btr_cur_get_block(cursor)->page.lock.not_recursive()
-	      || mtr->memo_contains(index->lock, MTR_MEMO_X_LOCK));
-
-	offsets = rec_get_offsets(node_ptr, index, offsets, 0,
-				  ULINT_UNDEFINED, &heap);
-
-	if (btr_node_ptr_get_child_page_no(node_ptr, offsets) != page_no) {
-		offsets = nullptr;
-	}
-
-	return(offsets);
-}
-
-static bool btr_page_search_father(mtr_t *mtr, btr_cur_t *cursor)
-{
-  rec_t *rec=
-    page_rec_get_next(page_get_infimum_rec(cursor->block()->page.frame));
-  if (UNIV_UNLIKELY(!rec))
-    return false;
-  cursor->page_cur.rec= rec;
-  mem_heap_t *heap= mem_heap_create(100);
-  const bool got= btr_page_search_father_node_ptr(nullptr, heap, cursor, mtr);
-  mem_heap_free(heap);
-  return got;
-}
-
 /*************************************************************//**
 Merge as many records from the from_block to the to_block. Delete
 the from_block if all records are successfully merged to to_block.
@@ -472,7 +408,7 @@ btr_defragment_merge_pages(
 	parent.page_cur.index = index;
 	parent.page_cur.block = from_block;
 
-	if (!btr_page_search_father(mtr, &parent)) {
+	if (!btr_page_get_father(mtr, &parent)) {
 		to_block = nullptr;
 	} else if (n_recs_to_move == n_recs) {
 		/* The whole page is merged with the previous page,

storage/innobase/btr/btr0pcur.cc

 /*****************************************************************************
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2023, MariaDB Corporation.
+Copyright (c) 2016, 2022, 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
@@ -212,100 +212,24 @@ btr_pcur_copy_stored_position(
 	pcur_receive->old_n_fields = pcur_donate->old_n_fields;
 }
 
-/** Optimistically latches the leaf page or pages requested.
-@param[in]	block		guessed buffer block
-@param[in,out]	latch_mode	BTR_SEARCH_LEAF, ...
-@param[in,out]	pcur		cursor
-@param[in,out]	mtr		mini-transaction
-@return true if success */
-TRANSACTIONAL_TARGET
-static bool btr_pcur_optimistic_latch_leaves(buf_block_t *block,
-                                             btr_pcur_t *pcur,
-                                             btr_latch_mode *latch_mode,
-                                             mtr_t *mtr)
-{
-  ut_ad(block->page.buf_fix_count());
-  ut_ad(block->page.in_file());
-  ut_ad(block->page.frame);
-
-  static_assert(BTR_SEARCH_PREV & BTR_SEARCH_LEAF, "");
-  static_assert(BTR_MODIFY_PREV & BTR_MODIFY_LEAF, "");
-  static_assert((BTR_SEARCH_PREV ^ BTR_MODIFY_PREV) ==
-                (RW_S_LATCH ^ RW_X_LATCH), "");
-
-  const rw_lock_type_t mode=
-    rw_lock_type_t(*latch_mode & (RW_X_LATCH | RW_S_LATCH));
-
-  switch (*latch_mode) {
-  default:
-    ut_ad(*latch_mode == BTR_SEARCH_LEAF || *latch_mode == BTR_MODIFY_LEAF);
-    return buf_page_optimistic_get(mode, block, pcur->modify_clock, mtr);
-  case BTR_SEARCH_PREV: /* btr_pcur_move_backward_from_page() */
-  case BTR_MODIFY_PREV: /* Ditto, or ibuf_insert() */
-    page_id_t id{0};
-    uint32_t left_page_no;
-    ulint zip_size;
-    {
-      transactional_shared_lock_guard<block_lock> g{block->page.lock};
-      if (block->modify_clock != pcur->modify_clock)
-        return false;
-      id= block->page.id();
-      zip_size= block->zip_size();
-      left_page_no= btr_page_get_prev(block->page.frame);
-    }
-
-    if (left_page_no != FIL_NULL)
-    {
-      pcur->btr_cur.left_block=
-        buf_page_get_gen(page_id_t(id.space(), left_page_no), zip_size,
-                         mode, nullptr, BUF_GET_POSSIBLY_FREED, mtr);
-
-      if (pcur->btr_cur.left_block &&
-          btr_page_get_next(pcur->btr_cur.left_block->page.frame) !=
-          id.page_no())
-      {
-release_left_block:
-        mtr->release_last_page();
-        return false;
-      }
-    }
-    else
-      pcur->btr_cur.left_block= nullptr;
-
-    if (buf_page_optimistic_get(mode, block, pcur->modify_clock, mtr))
-    {
-      if (btr_page_get_prev(block->page.frame) == left_page_no)
-      {
-        /* block was already buffer-fixed while entering the function and
-        buf_page_optimistic_get() buffer-fixes it again. */
-        ut_ad(2 <= block->page.buf_fix_count());
-        *latch_mode= btr_latch_mode(mode);
-        return true;
-      }
-
-      mtr->release_last_page();
-    }
-
-    ut_ad(block->page.buf_fix_count());
-    if (pcur->btr_cur.left_block)
-      goto release_left_block;
-    return false;
-  }
-}
-
 /** Structure acts as functor to do the latching of leaf pages.
 It returns true if latching of leaf pages succeeded and false
 otherwise. */
 struct optimistic_latch_leaves
 {
   btr_pcur_t *const cursor;
-  btr_latch_mode *const latch_mode;
+  btr_latch_mode *latch_mode;
   mtr_t *const mtr;
 
+  optimistic_latch_leaves(btr_pcur_t *cursor, btr_latch_mode *latch_mode,
+                          mtr_t *mtr)
+    : cursor(cursor), latch_mode(latch_mode), mtr(mtr) {}
+
   bool operator() (buf_block_t *hint) const
   {
-    return hint &&
-      btr_pcur_optimistic_latch_leaves(hint, cursor, latch_mode, mtr);
+    return hint && btr_cur_optimistic_latch_leaves(
+             hint, cursor->modify_clock, latch_mode,
+             btr_pcur_get_btr_cur(cursor), mtr);
   }
 };
 
@@ -379,8 +303,8 @@ btr_pcur_t::restore_position(btr_latch_mode restore_latch_mode, mtr_t *mtr)
 		/* Try optimistic restoration. */
 
 		if (block_when_stored.run_with_hint(
-			optimistic_latch_leaves{this, &restore_latch_mode,
-						mtr})) {
+			optimistic_latch_leaves(this, &restore_latch_mode,
+						mtr))) {
 			pos_state = BTR_PCUR_IS_POSITIONED;
 			latch_mode = restore_latch_mode;
 
@@ -541,9 +465,18 @@ btr_pcur_move_to_next_page(
 		return DB_CORRUPTION;
 	}
 
+	ulint mode = cursor->latch_mode;
+	switch (mode) {
+	case BTR_SEARCH_TREE:
+		mode = BTR_SEARCH_LEAF;
+		break;
+	case BTR_MODIFY_TREE:
+		mode = BTR_MODIFY_LEAF;
+	}
+
 	dberr_t err;
 	buf_block_t* next_block = btr_block_get(
-		*cursor->index(), next_page_no, cursor->latch_mode & ~12,
+		*cursor->index(), next_page_no, mode,
 		page_is_leaf(page), mtr, &err);
 
 	if (UNIV_UNLIKELY(!next_block)) {

storage/innobase/btr/btr0sea.cc

@@ -1055,24 +1055,26 @@ btr_search_guess_on_hash(
 	index_id_t	index_id;
 
 	ut_ad(mtr->is_active());
-	ut_ad(index->is_btree() || index->is_ibuf());
 
-	/* Note that, for efficiency, the struct info may not be protected by
-	any latch here! */
-
-	if (latch_mode > BTR_MODIFY_LEAF
-	    || !info->last_hash_succ || !info->n_hash_potential
-	    || (tuple->info_bits & REC_INFO_MIN_REC_FLAG)) {
+	if (!btr_search_enabled) {
 		return false;
 	}
 
-	ut_ad(index->is_btree());
-        ut_ad(!index->table->is_temporary());
-
+	ut_ad(!index->is_ibuf());
 	ut_ad(latch_mode == BTR_SEARCH_LEAF || latch_mode == BTR_MODIFY_LEAF);
 	compile_time_assert(ulint{BTR_SEARCH_LEAF} == ulint{RW_S_LATCH});
 	compile_time_assert(ulint{BTR_MODIFY_LEAF} == ulint{RW_X_LATCH});
 
+	/* Not supported for spatial index */
+	ut_ad(!dict_index_is_spatial(index));
+
+	/* Note that, for efficiency, the struct info may not be protected by
+	any latch here! */
+
+	if (info->n_hash_potential == 0) {
+		return false;
+	}
+
 	cursor->n_fields = info->n_fields;
 	cursor->n_bytes = info->n_bytes;
 

storage/innobase/dict/dict0crea.cc

 /*****************************************************************************
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2023, MariaDB Corporation.
+Copyright (c) 2017, 2022, 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
@@ -722,7 +722,7 @@ dict_build_field_def_step(
 }
 
 /***************************************************************//**
-Creates an index tree for the index.
+Creates an index tree for the index if it is not a member of a cluster.
 @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
 static MY_ATTRIBUTE((nonnull, warn_unused_result))
 dberr_t
@@ -755,8 +755,9 @@ dict_create_index_tree_step(
 	pcur.btr_cur.page_cur.index =
 		UT_LIST_GET_FIRST(dict_sys.sys_indexes->indexes);
 
-	dberr_t err = btr_pcur_open(search_tuple, PAGE_CUR_L, BTR_MODIFY_LEAF,
-				    &pcur, &mtr);
+	dberr_t err =
+		btr_pcur_open(search_tuple, PAGE_CUR_L, BTR_MODIFY_LEAF,
+			      &pcur, 0, &mtr);
 
 	if (err != DB_SUCCESS) {
 func_exit:
@@ -767,25 +768,10 @@ dict_create_index_tree_step(
 	btr_pcur_move_to_next_user_rec(&pcur, &mtr);
 
 	if (UNIV_UNLIKELY(btr_pcur_is_after_last_on_page(&pcur))) {
-corrupted:
 		err = DB_CORRUPTION;
 		goto func_exit;
 	}
 
-	ulint	len;
-	byte*	data = rec_get_nth_field_old(btr_pcur_get_rec(&pcur),
-					     DICT_FLD__SYS_INDEXES__ID,
-					     &len);
-	if (UNIV_UNLIKELY(len != 8 || mach_read_from_8(data) != index->id)) {
-		goto corrupted;
-	}
-
-	data = rec_get_nth_field_old(btr_pcur_get_rec(&pcur),
-				     DICT_FLD__SYS_INDEXES__PAGE_NO, &len);
-	if (len != 4) {
-		goto corrupted;
-	}
-
 	if (index->is_readable()) {
 		index->set_modified(mtr);
 
@@ -798,6 +784,11 @@ dict_create_index_tree_step(
 				err = DB_OUT_OF_FILE_SPACE; );
 	}
 
+	ulint	len;
+	byte*	data = rec_get_nth_field_old(btr_pcur_get_rec(&pcur),
+					     DICT_FLD__SYS_INDEXES__PAGE_NO,
+					     &len);
+	ut_ad(len == 4);
 	mtr.write<4,mtr_t::MAYBE_NOP>(*btr_pcur_get_block(&pcur), data,
 				      node->page_no);
 	goto func_exit;

storage/innobase/dict/dict0dict.cc

@@ -2,7 +2,7 @@
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
-Copyright (c) 2013, 2023, MariaDB Corporation.
+Copyright (c) 2013, 2022, 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
@@ -4143,7 +4143,8 @@ void dict_set_corrupted(dict_index_t *index, const char *ctx)
 	dict_index_copy_types(tuple, sys_index, 2);
 	cursor.page_cur.index = sys_index;
 
-	if (cursor.search_leaf(tuple, PAGE_CUR_LE, BTR_MODIFY_LEAF, &mtr)
+	if (btr_cur_search_to_nth_level(0, tuple, PAGE_CUR_LE,
+					BTR_MODIFY_LEAF, &cursor, &mtr)
 	    != DB_SUCCESS) {
 		goto fail;
 	}
@@ -4218,7 +4219,8 @@ dict_index_set_merge_threshold(
 	dict_index_copy_types(tuple, sys_index, 2);
 	cursor.page_cur.index = sys_index;
 
-	if (cursor.search_leaf(tuple, PAGE_CUR_GE, BTR_MODIFY_LEAF, &mtr)
+	if (btr_cur_search_to_nth_level(0, tuple, PAGE_CUR_GE,
+					BTR_MODIFY_LEAF, &cursor, &mtr)
 	    != DB_SUCCESS) {
 		goto func_exit;
 	}

storage/innobase/dict/dict0load.cc

 /*****************************************************************************
 
 Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2023, MariaDB Corporation.
+Copyright (c) 2016, 2022, 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
@@ -1321,7 +1321,7 @@ static dberr_t dict_load_columns(dict_table_t *table, unsigned use_uncommitted,
 	dict_index_copy_types(&tuple, sys_index, 1);
 	pcur.btr_cur.page_cur.index = sys_index;
 
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 	if (err != DB_SUCCESS) {
 		goto func_exit;
@@ -1452,7 +1452,7 @@ dict_load_virtual_col(dict_table_t *table, bool uncommitted, ulint nth_v_col)
 	dict_index_copy_types(&tuple, sys_virtual_index, 2);
 	pcur.btr_cur.page_cur.index = sys_virtual_index;
 
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 	if (err != DB_SUCCESS) {
 		goto func_exit;
@@ -1688,7 +1688,8 @@ static dberr_t dict_load_fields(dict_index_t *index, bool uncommitted,
 	dict_index_copy_types(&tuple, sys_index, 1);
 	pcur.btr_cur.page_cur.index = sys_index;
 
-	dberr_t error = btr_pcur_open_on_user_rec(&tuple, BTR_SEARCH_LEAF,
+	dberr_t error = btr_pcur_open_on_user_rec(&tuple,
+						  PAGE_CUR_GE, BTR_SEARCH_LEAF,
 						  &pcur, &mtr);
 	if (error != DB_SUCCESS) {
 		goto func_exit;
@@ -1946,7 +1947,8 @@ dberr_t dict_load_indexes(dict_table_t *table, bool uncommitted,
 	dict_index_copy_types(&tuple, sys_index, 1);
 	pcur.btr_cur.page_cur.index = sys_index;
 
-	dberr_t error = btr_pcur_open_on_user_rec(&tuple, BTR_SEARCH_LEAF,
+	dberr_t error = btr_pcur_open_on_user_rec(&tuple,
+						  PAGE_CUR_GE, BTR_SEARCH_LEAF,
 						  &pcur, &mtr);
 	if (error != DB_SUCCESS) {
 		goto func_exit;
@@ -2347,7 +2349,7 @@ static dict_table_t *dict_load_table_one(const span<const char> &name,
 	bool uncommitted = false;
 reload:
 	mtr.start();
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 
 	if (err != DB_SUCCESS || !btr_pcur_is_on_user_rec(&pcur)) {
@@ -2605,7 +2607,8 @@ dict_load_table_on_id(
 
 	dict_table_t* table = nullptr;
 
-	if (btr_pcur_open_on_user_rec(&tuple, BTR_SEARCH_LEAF, &pcur, &mtr)
+	if (btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
+				      BTR_SEARCH_LEAF, &pcur, &mtr)
 	    == DB_SUCCESS
 	    && btr_pcur_is_on_user_rec(&pcur)) {
 		/*---------------------------------------------------*/
@@ -2711,7 +2714,7 @@ static dberr_t dict_load_foreign_cols(dict_foreign_t *foreign, trx_id_t trx_id)
 	pcur.btr_cur.page_cur.index = sys_index;
 
 	mem_heap_t* heap = nullptr;
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 	if (err != DB_SUCCESS) {
 		goto func_exit;
@@ -2888,7 +2891,7 @@ dict_load_foreign(
 	mtr.start();
 
 	mem_heap_t* heap = nullptr;
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 	if (err != DB_SUCCESS) {
 		goto err_exit;
@@ -3099,7 +3102,7 @@ dict_load_foreigns(
 	dict_index_copy_types(&tuple, sec_index, 1);
 	pcur.btr_cur.page_cur.index = sec_index;
 
-	dberr_t err = btr_pcur_open_on_user_rec(&tuple,
+	dberr_t err = btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
 						BTR_SEARCH_LEAF, &pcur, &mtr);
 	if (err != DB_SUCCESS) {
 		DBUG_RETURN(err);

storage/innobase/dict/dict0stats.cc

 /*****************************************************************************
 
 Copyright (c) 2009, 2019, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2015, 2023, MariaDB Corporation.
+Copyright (c) 2015, 2022, 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
@@ -1697,7 +1697,7 @@ static dberr_t page_cur_open_level(page_cur_t *page_cur, ulint level,
 static dberr_t btr_pcur_open_level(btr_pcur_t *pcur, ulint level, mtr_t *mtr,
                                    dict_index_t *index)
 {
-  pcur->latch_mode= BTR_SEARCH_LEAF;
+  pcur->latch_mode= BTR_SEARCH_TREE;
   pcur->search_mode= PAGE_CUR_G;
   pcur->pos_state= BTR_PCUR_IS_POSITIONED;
   pcur->btr_cur.page_cur.index= index;

storage/innobase/fsp/fsp0fsp.cc

 /*****************************************************************************
 
 Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2023, MariaDB Corporation.
+Copyright (c) 2017, 2022, 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
@@ -122,22 +122,15 @@ MY_ATTRIBUTE((nonnull, warn_unused_result))
 static buf_block_t *fsp_get_header(const fil_space_t *space, mtr_t *mtr,
                                    dberr_t *err)
 {
-  const page_id_t id{space->id, 0};
-  buf_block_t *block= mtr->get_already_latched(id, MTR_MEMO_PAGE_SX_FIX);
-  if (block)
-    *err= DB_SUCCESS;
-  else
+  buf_block_t *block= buf_page_get_gen(page_id_t(space->id, 0),
+                                       space->zip_size(), RW_SX_LATCH,
+                                       nullptr, BUF_GET_POSSIBLY_FREED,
+                                       mtr, err);
+  if (block && space->id != mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_ID +
+                                             block->page.frame))
   {
-    block= buf_page_get_gen(id, space->zip_size(), RW_SX_LATCH,
-                            nullptr, BUF_GET_POSSIBLY_FREED,
-                            mtr, err);
-    if (block &&
-        space->id != mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_ID +
-                                      block->page.frame))
-    {
-      *err= DB_CORRUPTION;
-      block= nullptr;
-    }
+    *err= DB_CORRUPTION;
+    block= nullptr;
   }
   return block;
 }

storage/innobase/handler/ha_innodb.cc

@@ -1549,7 +1549,8 @@ static void innodb_drop_database(handlerton*, char *path)
     mtr_t mtr;
     mtr.start();
     pcur.btr_cur.page_cur.index = sys_index;
-    err= btr_pcur_open_on_user_rec(&tuple, BTR_SEARCH_LEAF, &pcur, &mtr);
+    err= btr_pcur_open_on_user_rec(&tuple, PAGE_CUR_GE,
+                                   BTR_SEARCH_LEAF, &pcur, &mtr);
     if (err != DB_SUCCESS)
       goto err_exit;
 

storage/innobase/handler/handler0alter.cc

@@ -6081,8 +6081,7 @@ static bool innobase_instant_try(
 
 	que_thr_t* thr = pars_complete_graph_for_exec(
 		NULL, trx, ctx->heap, NULL);
-	page_id_t id{block->page.id()};
-	const bool is_root = id.page_no() == index->page;
+	const bool is_root = block->page.id().page_no() == index->page;
 
 	if (rec_is_metadata(rec, *index)) {
 		ut_ad(page_rec_is_user_rec(rec));
@@ -6099,10 +6098,8 @@ static bool innobase_instant_try(
 		}
 
 		/* Ensure that the root page is in the correct format. */
-		id.set_page_no(index->page);
-		buf_block_t* root = mtr.get_already_latched(
-			id, MTR_MEMO_PAGE_SX_FIX);
-
+		buf_block_t* root = btr_root_block_get(index, RW_X_LATCH,
+						       &mtr, &err);
 		if (UNIV_UNLIKELY(!root)) {
 			goto func_exit;
 		}

storage/innobase/ibuf/ibuf0ibuf.cc

 /*****************************************************************************
 
 Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2023, MariaDB Corporation.
+Copyright (c) 2016, 2022, 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
@@ -2297,7 +2297,7 @@ static void ibuf_delete_recs(const page_id_t page_id)
   btr_pcur_t pcur;
   pcur.btr_cur.page_cur.index= ibuf.index;
   ibuf_mtr_start(&mtr);
-  if (btr_pcur_open(&tuple, PAGE_CUR_GE, BTR_MODIFY_LEAF, &pcur, &mtr))
+  if (btr_pcur_open(&tuple, PAGE_CUR_GE, BTR_MODIFY_LEAF, &pcur, 0, &mtr))
     goto func_exit;
   if (!btr_pcur_is_on_user_rec(&pcur))
   {
@@ -2493,8 +2493,8 @@ ibuf_merge_space(
 	/* Position the cursor on the first matching record. */
 
 	pcur.btr_cur.page_cur.index = ibuf.index;
-	dberr_t err = btr_pcur_open(&tuple, PAGE_CUR_GE, BTR_SEARCH_LEAF,
-				    &pcur, &mtr);
+	dberr_t err = btr_pcur_open(&tuple, PAGE_CUR_GE,
+				    BTR_SEARCH_LEAF, &pcur, 0, &mtr);
 	ut_ad(err != DB_SUCCESS || page_validate(btr_pcur_get_page(&pcur),
 						 ibuf.index));
 
@@ -3238,7 +3238,7 @@ ibuf_insert_low(
 	ibuf_mtr_start(&mtr);
 	pcur.btr_cur.page_cur.index = ibuf.index;
 
-	err = btr_pcur_open(ibuf_entry, PAGE_CUR_LE, mode, &pcur, &mtr);
+	err = btr_pcur_open(ibuf_entry, PAGE_CUR_LE, mode, &pcur, 0, &mtr);
 	if (err != DB_SUCCESS) {
 func_exit:
 		ibuf_mtr_commit(&mtr);
@@ -4037,12 +4037,12 @@ bool ibuf_delete_rec(const page_id_t page_id, btr_pcur_t* pcur,
 
 	ibuf_mtr_start(mtr);
 	mysql_mutex_lock(&ibuf_mutex);
-	ibuf.index->lock.u_lock(SRW_LOCK_ARGS(__FILE__, __LINE__));
 
 	if (!ibuf_restore_pos(page_id, search_tuple, BTR_PURGE_TREE,
 			      pcur, mtr)) {
+
 		mysql_mutex_unlock(&ibuf_mutex);
-		ibuf.index->lock.u_unlock();
+		ut_ad(mtr->has_committed());
 		goto func_exit;
 	}
 
@@ -4053,11 +4053,13 @@ bool ibuf_delete_rec(const page_id_t page_id, btr_pcur_t* pcur,
 		ut_a(err == DB_SUCCESS);
 
 		ibuf_size_update(ibuf_root->page.frame);
+		mysql_mutex_unlock(&ibuf_mutex);
+
 		ibuf.empty = page_is_empty(ibuf_root->page.frame);
+	} else {
+		mysql_mutex_unlock(&ibuf_mutex);
 	}
 
-	mysql_mutex_unlock(&ibuf_mutex);
-	ibuf.index->lock.u_unlock();
 	ibuf_btr_pcur_commit_specify_mtr(pcur, mtr);
 
 func_exit:
@@ -4235,7 +4237,7 @@ dberr_t ibuf_merge_or_delete_for_page(buf_block_t *block,
 
 	/* Position pcur in the insert buffer at the first entry for this
 	index page */
-	if (btr_pcur_open_on_user_rec(search_tuple,
+	if (btr_pcur_open_on_user_rec(search_tuple, PAGE_CUR_GE,
 				      BTR_MODIFY_LEAF, &pcur, &mtr)
 	    != DB_SUCCESS) {
 		err = DB_CORRUPTION;
@@ -4452,7 +4454,7 @@ void ibuf_delete_for_discarded_space(ulint space)
 
 	/* Position pcur in the insert buffer at the first entry for the
 	space */
-	if (btr_pcur_open_on_user_rec(&search_tuple,
+	if (btr_pcur_open_on_user_rec(&search_tuple, PAGE_CUR_GE,
 				      BTR_MODIFY_LEAF, &pcur, &mtr)
 	    != DB_SUCCESS) {
 		goto leave_loop;

storage/innobase/include/btr0btr.h

@@ -2,7 +2,7 @@
 
 Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
-Copyright (c) 2014, 2023, MariaDB Corporation.
+Copyright (c) 2014, 2022, 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
@@ -211,12 +211,13 @@ btr_write_autoinc(dict_index_t* index, ib_uint64_t autoinc, bool reset = false)
 @param[in,out]	mtr	mini-transaction */
 void btr_set_instant(buf_block_t* root, const dict_index_t& index, mtr_t* mtr);
 
-ATTRIBUTE_COLD __attribute__((nonnull))
+ATTRIBUTE_COLD __attribute__((nonnull, warn_unused_result))
 /** Reset the table to the canonical format on ROLLBACK of instant ALTER TABLE.
 @param[in]      index   clustered index with instant ALTER TABLE
 @param[in]      all     whether to reset FIL_PAGE_TYPE as well
-@param[in,out]  mtr     mini-transaction */
-void btr_reset_instant(const dict_index_t &index, bool all, mtr_t *mtr);
+@param[in,out]  mtr     mini-transaction
+@return error code */
+dberr_t btr_reset_instant(const dict_index_t &index, bool all, mtr_t *mtr);
 
 /*************************************************************//**
 Makes tree one level higher by splitting the root, and inserts
@@ -240,7 +241,7 @@ btr_root_raise_and_insert(
 	ulint		n_ext,	/*!< in: number of externally stored columns */
 	mtr_t*		mtr,	/*!< in: mtr */
 	dberr_t*	err)	/*!< out: error code */
-	MY_ATTRIBUTE((nonnull, warn_unused_result));
+	MY_ATTRIBUTE((warn_unused_result));
 /*************************************************************//**
 Reorganizes an index page.
 

storage/innobase/include/gis0type.h

 /*****************************************************************************
 
 Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2018, 2023, MariaDB Corporation.
+Copyright (c) 2018, 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
@@ -105,6 +105,12 @@ typedef	struct rtr_info{
 	matched_rec_t*	matches;/*!< struct holding matching leaf records */
 	mysql_mutex_t	rtr_path_mutex;
 				/*!< mutex protect the "path" vector */
+	buf_block_t*	tree_blocks[RTR_MAX_LEVELS + RTR_LEAF_LATCH_NUM];
+				/*!< tracking pages that would be locked
+				at leaf level, for future free */
+        ulint		tree_savepoints[RTR_MAX_LEVELS + RTR_LEAF_LATCH_NUM];
+				/*!< savepoint used to release latches/blocks
+				on each level and leaf level */
 	rtr_mbr_t	mbr;	/*!< the search MBR */
 	que_thr_t*      thr;	/*!< the search thread */
 	mem_heap_t*	heap;	/*!< memory heap */

storage/innobase/include/ibuf0ibuf.inl

@@ -100,8 +100,9 @@ ibuf_should_try(
 						decide */
 {
 	return(innodb_change_buffering
-	       && !(index->type & (DICT_CLUSTERED | DICT_IBUF))
 	       && ibuf.max_size != 0
+	       && !dict_index_is_clust(index)
+	       && !dict_index_is_spatial(index)
 	       && index->table->quiesce == QUIESCE_NONE
 	       && (ignore_sec_unique || !dict_index_is_unique(index)));
 }