Merge 10.6

mysql-test/suite/innodb/r/insert_into_empty.result

@@ -197,8 +197,6 @@ DROP TABLE t1;
 #
 # MDEV-27214 Import with disabled keys corrupts meta-data like rows, indexes, ...
 #
-SET UNIQUE_CHECKS=0;
-SET FOREIGN_KEY_CHECKS=0;
 CREATE TABLE `t1` (
 `id` int(11) NOT NULL,
 `a` int(11) DEFAULT NULL,

mysql-test/suite/innodb/t/insert_into_empty.test

@@ -214,8 +214,6 @@ DROP TABLE t1;
 --echo # MDEV-27214 Import with disabled keys corrupts meta-data like rows, indexes, ...
 --echo #
 
-SET UNIQUE_CHECKS=0;
-SET FOREIGN_KEY_CHECKS=0;
 CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   `a` int(11) DEFAULT NULL,
@@ -231,5 +229,4 @@ SELECT TABLE_ROWS, AVG_ROW_LENGTH>0 FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
 DROP TABLE t1;
 
-
 --echo # End of 10.6 tests

mysql-test/suite/innodb_fts/r/misc_debug.result

@@ -68,7 +68,7 @@ DROP TABLE t1;
 CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
 SET DEBUG_DBUG="+d,stats_lock_fail";
 ALTER TABLE t1 ADD FULLTEXT(f2);
-ERROR HY000: Got error 15 "Block device required" from storage engine InnoDB
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 SET debug_dbug=@saved_debug_dbug;
 ALTER TABLE t1 DISCARD TABLESPACE;
 ALTER TABLE t1 ADD FULLTEXT(f2);

mysql-test/suite/innodb_fts/t/misc_debug.test

@@ -108,7 +108,7 @@ DROP TABLE t1;
 
 CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
 SET DEBUG_DBUG="+d,stats_lock_fail";
---error ER_GET_ERRNO
+--error ER_LOCK_WAIT_TIMEOUT
 ALTER TABLE t1 ADD FULLTEXT(f2);
 SET debug_dbug=@saved_debug_dbug;
 ALTER TABLE t1 DISCARD TABLESPACE;

storage/innobase/handler/handler0alter.cc

@@ -11273,7 +11273,7 @@ ha_innobase::commit_inplace_alter_table(
 	}
 
 	DBUG_EXECUTE_IF("stats_lock_fail",
-			error = DB_LOCK_WAIT;);
+			error = DB_LOCK_WAIT_TIMEOUT;);
 
 	if (error == DB_SUCCESS) {
 		error = lock_sys_tables(trx);