Merge 10.6 into 10.11

dr-m · dr-m · commit 97b32c44c865 · 2025-11-11T10:29:45.000+02:00
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -6096,16 +6096,12 @@ xb_delta_open_matching_space(
 	ut_ad(fil_space_t::physical_size(flags) == info.page_size);
 
 	mysql_mutex_lock(&fil_system.mutex);
-	fil_space_t* space = fil_space_t::create(uint32_t(info.space_id),
-						 flags, false, 0,
-						 FIL_ENCRYPTION_DEFAULT, true);
+	std::ignore = fil_space_t::create(uint32_t(info.space_id),
+					  flags, false, 0,
+					  FIL_ENCRYPTION_DEFAULT, true);
 	mysql_mutex_unlock(&fil_system.mutex);
-	if (space) {
-		*success = xb_space_create_file(real_name, info.space_id,
-						flags, &file);
-	} else {
-		msg("Can't create tablespace %s\n", dest_space_name);
-	}
+	*success = xb_space_create_file(real_name, info.space_id,
+					flags, &file);
 
 	goto exit;
 }
diff --git a/include/ilist.h b/include/ilist.h
@@ -189,6 +189,9 @@ template <class T, class Tag= void> class ilist
     ListNode *prev= pos.node_->prev;
     ListNode *next= pos.node_->next;
 
+    DBUG_ASSERT(prev->next == pos.node_);
+    DBUG_ASSERT(next->prev == pos.node_);
+
     prev->next= next;
     next->prev= prev;
 
@@ -202,7 +205,7 @@ template <class T, class Tag= void> class ilist
   }
 
   void push_back(reference value) noexcept { insert(end(), value); }
-  void pop_back() noexcept { erase(end()); }
+  void pop_back() noexcept { erase(--end()); }
 
   void push_front(reference value) noexcept { insert(begin(), value); }
   void pop_front() noexcept { erase(begin()); }
diff --git a/mysql-test/suite/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result
@@ -220,4 +220,26 @@ SELECT * FROM t1;
 a	b
 1	1
 2	1
+connect ddl, localhost, root;
+SET DEBUG_SYNC = 'fil_ibd_create_logged SIGNAL stuck WAIT_FOR ever';
+ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR stuck';
+# Kill the server
+disconnect ddl;
+# restart
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+SELECT * FROM t1;
+a	b
+1	1
+2	1
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/alter_kill.result b/mysql-test/suite/innodb/r/alter_kill.result
@@ -36,6 +36,10 @@ BEGIN;
 INSERT INTO t1 VALUES(42);
 connect  con1,localhost,root;
 CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
+SET GLOBAL innodb_max_purge_lag_wait=2;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
 XA START 'x';
 INSERT INTO bug16735660 VALUES(1),(2),(3);
 XA END 'x';
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result
@@ -1920,16 +1920,10 @@ CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 # Kill the server
 # Wrong space_id in a dirty file and a missing file
 # restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-# Restore t1 and t2
-# restart
-SELECT * FROM t1;
-f1
-SELECT * FROM t2;
-f1
+CHECK TABLE t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+test.t2	check	status	OK
 DROP TABLE t1, t2;
 #
 #  MDEV-18186 assertion failure on missing InnoDB index
diff --git a/mysql-test/suite/innodb/r/log_file_name.result b/mysql-test/suite/innodb/r/log_file_name.result
@@ -19,23 +19,6 @@ WHERE engine = 'innodb'
 AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 FOUND 1 /InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Another data file called .*t1.ibd exists with the same space ID/ in mysqld.1.err
-# Fault 2: Wrong space_id in a dirty file, and a missing file.
-# restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-FOUND 1 /InnoDB: Tablespace \d+ was not found at.*t3.ibd/ in mysqld.1.err
-# Fault 3: Wrong space_id in a dirty file, and no missing file.
-# restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-FOUND 1 /InnoDB: Ignoring data file '.*t[23].ibd' with space ID/ in mysqld.1.err
-NOT FOUND /InnoDB: Tablespace \d+ was not found at .*t1.ibd/ in mysqld.1.err
-FOUND 1 /InnoDB: Tablespace \d+ was not found at .*t3.ibd/ in mysqld.1.err
-FOUND 2 /InnoDB: Set innodb_force_recovery=1 to ignore this and to permanently lose all changes to the tablespace/ in mysqld.1.err
 # Fault 4: Missing data file
 # restart
 SELECT * FROM INFORMATION_SCHEMA.ENGINES
@@ -57,6 +40,7 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 NOT FOUND /\[Note\] InnoDB: Cannot read first page of .*t2.ibd/ in mysqld.1.err
 FOUND 1 /.*\[ERROR\] InnoDB: Cannot apply log to \[page id: space=[1-9][0-9]*, page number=3\] of corrupted file './test/t2\.ibd'/ in mysqld.1.err
+# Fault 2: Wrong space_id in a dirty file, and a missing file.
 # restart
 SELECT * FROM t2;
 a
@@ -78,6 +62,16 @@ CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 ERROR HY000: Can't create table `test`.`t0` (errno: 184 "Tablespace already exists")
 CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 DROP TABLE t0;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+ERROR HY000: Can't create table `test`.`t1` (errno: 184 "Tablespace already exists")
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+ERROR HY000: Can't create table `test`.`t1` (errno: 184 "Tablespace already exists")
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+DROP TABLE t1;
+SET GLOBAL innodb_max_purge_lag_wait=0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
 CREATE TABLE u1(a INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE u2(a INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE u3(a INT PRIMARY KEY) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/alter_crash.test b/mysql-test/suite/innodb/t/alter_crash.test
@@ -223,6 +223,20 @@ SET GLOBAL innodb_fil_make_page_dirty_debug=0;
 disconnect ddl;
 --source include/start_mysqld.inc
 
+CHECK TABLE t1;
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+connect ddl, localhost, root;
+SET DEBUG_SYNC = 'fil_ibd_create_logged SIGNAL stuck WAIT_FOR ever';
+send ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR stuck';
+
+--source include/kill_mysqld.inc
+disconnect ddl;
+--source include/start_mysqld.inc
+
 CHECK TABLE t1;
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
diff --git a/mysql-test/suite/innodb/t/alter_kill.test b/mysql-test/suite/innodb/t/alter_kill.test
@@ -139,6 +139,17 @@ INSERT INTO t1 VALUES(42);
 
 CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
 
+# Force a log checkpoint to "discard" any FILE_CREATE records.
+SET GLOBAL innodb_max_purge_lag_wait=2;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
+
 XA START 'x';
 --source ../include/no_checkpoint_start.inc
 INSERT INTO bug16735660 VALUES(1),(2),(3);
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1132,29 +1132,13 @@ CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 --let CLEANUP_IF_CHECKPOINT=DROP TABLE t1, t2;
 --source include/no_checkpoint_end.inc
 
-let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
-let $check_no_innodb=SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-
 --echo # Wrong space_id in a dirty file and a missing file
-
---copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t0.ibd
 --move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t1.ibd
 
 --source include/start_mysqld.inc
---eval $check_no_innodb
---source include/shutdown_mysqld.inc
-
---echo # Restore t1 and t2
-
---move_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
---move_file $MYSQLD_DATADIR/test/t0.ibd $MYSQLD_DATADIR/test/t1.ibd
-
---source include/start_mysqld.inc
-
-SELECT * FROM t1;
-SELECT * FROM t2;
+# Because the tables were created after the checkpoint,
+# InnoDB will start up, but the tables will be corrupted.
+CHECK TABLE t1, t2;
 
 DROP TABLE t1, t2;
 
diff --git a/mysql-test/suite/innodb/t/log_file_name.test b/mysql-test/suite/innodb/t/log_file_name.test
@@ -45,53 +45,13 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 eval $check_no_innodb;
 let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Another data file called .*t1.ibd exists with the same space ID;
 --source include/search_pattern_in_file.inc
-
---source include/shutdown_mysqld.inc
-
---remove_file $MYSQLD_DATADIR/test/t1.ibd
-
-# This could fail to refuse InnoDB startup, in case there was a log
-# checkpoint after the CREATE TABLE t3. That is what we checked above.
---echo # Fault 2: Wrong space_id in a dirty file, and a missing file.
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t1.ibd
-
---source include/start_mysqld.inc
-eval $check_no_innodb;
-
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at.*t3.ibd;
---source include/search_pattern_in_file.inc
-
 --source include/shutdown_mysqld.inc
 
---move_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t3.ibd
-
---echo # Fault 3: Wrong space_id in a dirty file, and no missing file.
-# Swap t2.ibd and t3.ibd.
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t.ibd
---move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t3.ibd
---move_file $MYSQLD_DATADIR/test/t.ibd $MYSQLD_DATADIR/test/t2.ibd
-
---source include/start_mysqld.inc
-eval $check_no_innodb;
-
-let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t[23].ibd' with space ID;
---source include/search_pattern_in_file.inc
-
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t1.ibd;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t3.ibd;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Set innodb_force_recovery=1 to ignore this and to permanently lose all changes to the tablespace;
---source include/search_pattern_in_file.inc
-
---source include/shutdown_mysqld.inc
-
-# Swap back t3.ibd, but hide t2.ibd (which the redo log also knows as t1.ibd).
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t.ibd
---move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t3.ibd
-
 --echo # Fault 4: Missing data file
 
+--move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t.ibd
+--remove_file $MYSQLD_DATADIR/test/t1.ibd
+
 --source include/start_mysqld.inc
 eval $check_no_innodb;
 --source include/shutdown_mysqld.inc
@@ -108,15 +68,6 @@ let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t[12].ibd.
 eval $check_no_innodb;
 --source include/shutdown_mysqld.inc
 
-# On Linux, lseek() would typically report EINVAL when invoked on a directory.
-# On other plaftorms as well as some GNU/Linux based environments, such as
-# a Ubuntu 22.04 based image on Amazon Web Services,
-# os_file_get_size() would succeed on a directory, and we would get another
-# error about inability to apply log to a corrupted page.
-
-#--let SEARCH_PATTERN= InnoDB: Could not measure the size of single-table tablespace file '.*test/t2\\.ibd'
-#--source include/search_pattern_in_file.inc
-
 --rmdir $MYSQLD_DATADIR/test/t2.ibd
 
 # Create a short file.
@@ -136,6 +87,9 @@ let SEARCH_PATTERN= .*\[ERROR\] InnoDB: Cannot apply log to \\[page id: space=[1
 --remove_file $MYSQLD_DATADIR/test/t2.ibd
 --move_file $MYSQLD_DATADIR/test/t.ibd $MYSQLD_DATADIR/test/t2.ibd
 
+--echo # Fault 2: Wrong space_id in a dirty file, and a missing file.
+--move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t1.ibd
+
 --source include/start_mysqld.inc
 
 SELECT * FROM t2;
@@ -150,13 +104,20 @@ CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 --remove_file $MYSQLD_DATADIR/test/t0.ibd
 CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 DROP TABLE t0;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+--remove_file $MYSQLD_DATADIR/test/t1.ibd
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+DROP TABLE t1;
 
 --disable_query_log
 # The following are for the orphan file t0.ibd or for the directory t2.ibd:
 call mtr.add_suppression("InnoDB: Operating system error number [0-9]* in a file operation");
 call mtr.add_suppression("InnoDB: Error number \\d+ means");
 call mtr.add_suppression("InnoDB: Cannot create file '.*t0.ibd'");
-call mtr.add_suppression("InnoDB: The file '.*t0\.ibd' already exists");
+call mtr.add_suppression("InnoDB: The file '.*t[01]\.ibd' already exists");
 call mtr.add_suppression("InnoDB: Cannot open datafile for read-write: '.*t2\.ibd'");
 call mtr.add_suppression("InnoDB: Could not measure the size of single-table tablespace file '.*test/t2\\.ibd'");
 # The following are for aborted startup without --innodb-force-recovery:
@@ -186,6 +147,17 @@ call mtr.add_suppression("InnoDB: Cannot read first page in datafile:");
 FLUSH TABLES;
 --enable_query_log
 
+# Force a log checkpoint to "discard" any FILE_CREATE records.
+SET GLOBAL innodb_max_purge_lag_wait=0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
+
 --source include/no_checkpoint_start.inc
 
 CREATE TABLE u1(a INT PRIMARY KEY) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result b/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
@@ -272,6 +272,7 @@ call mtr.add_suppression("InnoDB: Operating system error number .* in a file ope
 call mtr.add_suppression("InnoDB: Error number .* means");
 call mtr.add_suppression("InnoDB: Cannot create file");
 call mtr.add_suppression("InnoDB: Failed to create");
+call mtr.add_suppression("InnoDB: The file '.*test/FTS_[0-9a-f]*_BEING_DELETED\\.ibd' already exists");
 CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
 ALTER TABLE t1 ADD FULLTEXT(a), ALGORITHM=INPLACE;
 ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
diff --git a/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test b/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
@@ -365,6 +365,7 @@ call mtr.add_suppression("InnoDB: Operating system error number .* in a file ope
 call mtr.add_suppression("InnoDB: Error number .* means");
 call mtr.add_suppression("InnoDB: Cannot create file");
 call mtr.add_suppression("InnoDB: Failed to create");
+call mtr.add_suppression("InnoDB: The file '.*test/FTS_[0-9a-f]*_BEING_DELETED\\.ibd' already exists");
 
 let MYSQLD_DATADIR=`select @@datadir`;
 CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
@@ -2395,7 +2395,7 @@ create or replace table t1 (x int) with system versioning engine innodb
 partition by system_time interval 1 hour auto;
 insert into t1 values (1);
 call mtr.add_suppression("rror number .*(File exists|file operation)");
-call mtr.add_suppression("InnoDB: Cannot create file");
+call mtr.add_suppression("InnoDB: The file '.*test/t1#P#p1\\.ibd' already exists");
 set timestamp= unix_timestamp('2000-01-01 01:00:00');
 update t1 set x= x + 2;
 ERROR HY000: Got error 184 "Tablespace already exists" from storage engine InnoDB
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
@@ -1904,7 +1904,7 @@ partition by system_time interval 1 hour auto;
 insert into t1 values (1);
 
 call mtr.add_suppression("rror number .*(File exists|file operation)");
-call mtr.add_suppression("InnoDB: Cannot create file");
+call mtr.add_suppression("InnoDB: The file '.*test/t1#P#p1\\.ibd' already exists");
 
 --let $datadir= `select @@datadir`
 --let $dummy= $datadir/test/t1#P#p1.ibd
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
diff --git a/storage/innobase/fsp/fsp0space.cc b/storage/innobase/fsp/fsp0space.cc
diff --git a/storage/innobase/fsp/fsp0sysspace.cc b/storage/innobase/fsp/fsp0sysspace.cc
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc
