Merge 10.7 into 10.8

MariaDB · Nov 24, 2022 · c0439b1 · c0439b1
2 parents 5b1eb87 + 22ab79c
commit c0439b1
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 137 deletions.
diff --git a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result
@@ -1,6 +1,6 @@
-call mtr.add_suppression("mariadbd.*: File .*");
-call mtr.add_suppression("Plugin 'file_key_management' .*");
-call mtr.add_suppression("InnoDB: We do not continue the crash recovery");
+call mtr.add_suppression("mariadbd.*: File ");
+call mtr.add_suppression("Plugin 'file_key_management' ");
+call mtr.add_suppression("InnoDB: Recovery cannot access file");
 call mtr.add_suppression("InnoDB: Plugin initialization aborted");
 call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
 call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed.");

diff --git a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test
@@ -3,9 +3,9 @@
 # embedded does not support restart
 -- source include/not_embedded.inc
 
-call mtr.add_suppression("mariadbd.*: File .*");
-call mtr.add_suppression("Plugin 'file_key_management' .*");
-call mtr.add_suppression("InnoDB: We do not continue the crash recovery");
+call mtr.add_suppression("mariadbd.*: File ");
+call mtr.add_suppression("Plugin 'file_key_management' ");
+call mtr.add_suppression("InnoDB: Recovery cannot access file");
 call mtr.add_suppression("InnoDB: Plugin initialization aborted");
 call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
 call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed.");

diff --git a/mysql-test/suite/innodb/r/ibuf_not_empty.result b/mysql-test/suite/innodb/r/ibuf_not_empty.result
@@ -12,7 +12,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	Warning	InnoDB: Index 'b' contains 990 entries, should be 1024.
 test.t1	check	error	Corrupt
-# restart
+# restart: --innodb-force_recovery=0
 SET GLOBAL innodb_fast_shutdown=0;
-# restart
+# restart: --innodb-force_recovery=0
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/ibuf_not_empty.test b/mysql-test/suite/innodb/t/ibuf_not_empty.test
@@ -11,6 +11,8 @@ call mtr.add_suppression("InnoDB: Failed to find tablespace for table `test`\\.`
 call mtr.add_suppression("InnoDB: Allocated tablespace ID \\d+ for test.t1, old maximum was");
 call mtr.add_suppression("InnoDB: Failed to find tablespace for table `mysql`\\.`transaction_registry` in the cache\\. Attempting to load the tablespace with space id");
 call mtr.add_suppression("InnoDB: Allocated tablespace ID \\d+ for mysql.transaction_registry, old maximum was");
+call mtr.add_suppression("InnoDB: Trying to read 4096 bytes");
+call mtr.add_suppression("InnoDB: File './test/t1.ibd' is corrupted");
 --enable_query_log
 
 CREATE TABLE t1(
@@ -106,7 +108,7 @@ truncate(FILE, $ps * $pages);
 close(FILE) || die "Unable to close $file";
 EOF
 
---let $restart_parameters=
+--let $restart_parameters=--innodb-force_recovery=0
 --source include/start_mysqld.inc
 SET GLOBAL innodb_fast_shutdown=0;
 --source include/restart_mysqld.inc

diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
@@ -1110,7 +1110,6 @@ void setup_connection_thread_globals(THD *thd)
 {
   DBUG_EXECUTE_IF("CONNECT_wait", {
     extern Dynamic_array<MYSQL_SOCKET> listen_sockets;
-    DBUG_ASSERT(listen_sockets.size());
     while (listen_sockets.size())
       my_sleep(1000);
   });

diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
@@ -2687,7 +2687,7 @@ buf_page_get_low(
 re_evict:
 	if (mode != BUF_GET_IF_IN_POOL
 	    && mode != BUF_GET_IF_IN_POOL_OR_WATCH) {
-	} else if (!ibuf_debug) {
+	} else if (!ibuf_debug || recv_recovery_is_on()) {
 	} else if (fil_space_t* space = fil_space_t::get(page_id.space())) {
 		/* Try to evict the block from the buffer pool, to use the
 		insert buffer (change buffer) as much as possible. */