Merge 10.5 into 10.6

12 files changed, 11 insertions, 28 deletions

diff --git a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result
index 589570d8300..b11484367b8 100644
--- a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result
+++ b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 CREATE TEMPORARY SEQUENCE seq_1;
 XA START '3';
 CREATE TEMPORARY TABLE tmp_1(c INT);
diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result
index 789bc6cd178..7514380b715 100644
--- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result
+++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #
diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result
index 1b1d2a79725..a889a2fa82e 100644
--- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result
+++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #
diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result
index 6fdda842bac..e44d0a275d7 100644
--- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result
+++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #
diff --git a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test
index 2890c42a087..b127178ebf7 100644
--- a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test
+++ b/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
diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_binary.test b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_binary.test
index 5997cfd5d27..29e10ede98a 100644
--- a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_binary.test
+++ b/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 #
diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test
index 1e218acdfea..8c9e22421b6 100644
--- a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test
+++ b/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 #
diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_utf32.test b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_utf32.test
index c1d449abf2f..094de058028 100644
--- a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_utf32.test
+++ b/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 #
diff --git a/mysql-test/suite/maria/rollback.result b/mysql-test/suite/maria/rollback.result
index 959f596edf2..2e58387ce57 100644
--- a/mysql-test/suite/maria/rollback.result
+++ b/mysql-test/suite/maria/rollback.result
@@ -1,3 +1,4 @@
+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;
diff --git a/mysql-test/suite/maria/rollback.test b/mysql-test/suite/maria/rollback.test
index 1469c26eaa2..d42be9274e6 100644
--- a/mysql-test/suite/maria/rollback.test
+++ b/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: .*");
 
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h
index ea8973c2d3b..36bc8321833 100644
--- a/storage/innobase/include/mtr0mtr.h
+++ b/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; }
diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc
index 02965821ced..3b7ac906395 100644
--- a/storage/innobase/mtr/mtr0mtr.cc
+++ b/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;