Merge 10.5 into 10.6

mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result

+RESET MASTER;
 CREATE TEMPORARY SEQUENCE seq_1;
 XA START '3';
 CREATE TEMPORARY TABLE tmp_1(c INT);

mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result

+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result

+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result

+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test

@@ -4,7 +4,7 @@
 --source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 
-
+RESET MASTER; # clear binlogs
 # MDEV-22420 DDL on temporary object is prohibited when XA is in prepare state
 
 # Temporary sequnce may not be created within a transaction

mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_binary.test

@@ -20,6 +20,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test

@@ -21,6 +21,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_utf32.test

@@ -21,6 +21,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

mysql-test/suite/maria/rollback.result

+reset master;
 call mtr.add_suppression("Table was marked as crashed");
 call mtr.add_suppression("Checking table: .*");
 create table t1 (a int primary key auto_increment, b int) engine=aria transactional= 1;

mysql-test/suite/maria/rollback.test

@@ -3,6 +3,8 @@
 # no-protocol doesn't print warnings about repaired tables
 --source include/no_protocol.inc
 
+reset master; # clear binlogs
+
 call mtr.add_suppression("Table was marked as crashed");
 call mtr.add_suppression("Checking table: .*");
 

storage/innobase/include/mtr0mtr.h

@@ -295,10 +295,6 @@ struct mtr_t {
   @param type	object type
   @return bool if lock released */
   bool memo_release(const void *object, ulint type);
-  /** Release a page latch.
-  @param[in]	ptr	pointer to within a page frame
-  @param[in]	type	object type: MTR_MEMO_PAGE_X_FIX, ... */
-  void release_page(const void *ptr, mtr_memo_type_t type);
 
   /** Note that the mini-transaction will modify data. */
   void flag_modified() { m_modifications = true; }

storage/innobase/mtr/mtr0mtr.cc

@@ -838,29 +838,6 @@ mtr_t::memo_release(const void* object, ulint type)
 	return(false);
 }
 
-/** Release a page latch.
-@param[in]	ptr	pointer to within a page frame
-@param[in]	type	object type: MTR_MEMO_PAGE_X_FIX, ... */
-void
-mtr_t::release_page(const void* ptr, mtr_memo_type_t type)
-{
-	ut_ad(is_active());
-
-	/* We cannot release a page that has been written to in the
-	middle of a mini-transaction. */
-	ut_ad(!m_modifications || type != MTR_MEMO_PAGE_X_FIX);
-
-	Iterate<FindPage> iteration(FindPage(ptr, type));
-
-	if (!m_memo.for_each_block_in_reverse(iteration)) {
-		memo_slot_release(iteration.functor.get_slot());
-		return;
-	}
-
-	/* The page was not found! */
-	ut_ad(0);
-}
-
 static bool log_margin_warned;
 static time_t log_margin_warn_time;
 static bool log_close_warned;