3 files changed, 57 insertions, 29 deletions
diff --git a/mysql-test/suite/innodb/t/alter_partitioned.test b/mysql-test/suite/innodb/t/alter_partitioned.test
index 056791c6a0c..4990c265b5e 100644
--- a/mysql-test/suite/innodb/t/alter_partitioned.test
+++ b/mysql-test/suite/innodb/t/alter_partitioned.test
@@ -1,31 +1,10 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
 
-CREATE TABLE t1(a INT, b VARCHAR(10), INDEX(a))ENGINE=InnoDB
-PARTITION BY RANGE(a)
-(PARTITION pa VALUES LESS THAN (3),
-PARTITION pb VALUES LESS THAN (5));
-
---error ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING
-CREATE TABLE t2(a INT, FOREIGN KEY(a) REFERENCES t1(a))ENGINE=INNODB
-PARTITION BY RANGE(a)
-(PARTITION pa VALUES LESS THAN (2),
-PARTITION pb VALUES LESS THAN (4));
-
-DROP TABLE t1;
-
 --echo #
---echo # MDEV-24754 Server crash in
---echo # ha_partition_inplace_ctx::~ha_partition_inplace_ctx
+--echo # MDEV-26077 Assertion failure err != DB_DUPLICATE_KEY
+--echo # or unexpected ER_TABLE_EXISTS_ERROR
 --echo #
-CREATE TABLE t1 (id INT PRIMARY KEY, a INT, va INT AS (a) VIRTUAL)
-ENGINE=InnoDB PARTITION BY HASH(id) PARTITIONS 2;
-ALTER TABLE t1 ADD b INT, ALGORITHM=INSTANT;
-DROP TABLE t1;
-
---echo #
---echo # MDEV-25902 Unexpected ER_LOCK_WAIT_TIMEOUT and result,
---echo # assertion failure err != DB_DUPLICATE_KEY
 
 CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (pk INT PRIMARY KEY) ENGINE=InnoDB;
@@ -54,4 +33,30 @@ ALTER TABLE t2 PARTITION BY HASH(pk);
 --connection default
 DROP TABLE t1, t2;
 
---echo # End of 10.6 tests
+--echo # End of 10.2 tests
+
+CREATE TABLE t1(a INT, b VARCHAR(10), INDEX(a))ENGINE=InnoDB
+PARTITION BY RANGE(a)
+(PARTITION pa VALUES LESS THAN (3),
+PARTITION pb VALUES LESS THAN (5));
+
+--error ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING
+CREATE TABLE t2(a INT, FOREIGN KEY(a) REFERENCES t1(a))ENGINE=INNODB
+PARTITION BY RANGE(a)
+(PARTITION pa VALUES LESS THAN (2),
+PARTITION pb VALUES LESS THAN (4));
+
+DROP TABLE t1;
+
+--echo # End of 10.3 tests
+
+--echo #
+--echo # MDEV-24754 Server crash in
+--echo # ha_partition_inplace_ctx::~ha_partition_inplace_ctx
+--echo #
+CREATE TABLE t1 (id INT PRIMARY KEY, a INT, va INT AS (a) VIRTUAL)
+ENGINE=InnoDB PARTITION BY HASH(id) PARTITIONS 2;
+ALTER TABLE t1 ADD b INT, ALGORITHM=INSTANT;
+DROP TABLE t1;
+
+--echo # End of 10.5 tests
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test
index 00903e2d401..60af7c9df80 100644
--- a/mysql-test/suite/innodb/t/innodb-alter.test
+++ b/mysql-test/suite/innodb/t/innodb-alter.test
@@ -663,13 +663,10 @@ DROP TABLE t1;
 
 # DATETIME-to-DATE truncation is OK
 CREATE TABLE t1 (a INT NOT NULL DEFAULT 0) ENGINE=InnoDB;
-SET @save_allowed = @@GLOBAL.innodb_instant_alter_column_allowed;
-SET GLOBAL innodb_instant_alter_column_allowed=never;
-iNSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (10);
 --enable_info
-ALTER TABLE t1 ADD b DATE NOT NULL DEFAULT if(unix_timestamp()>1,TIMESTAMP'2001-01-01 10:20:30',0);
+ALTER TABLE t1 ADD b DATE NOT NULL DEFAULT if(unix_timestamp()>1,TIMESTAMP'2001-01-01 10:20:30',0), algorithm=copy;
 --disable_info
-SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed;
 SELECT * FROM t1;
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test
index dcce4b29119..b553dc3ad74 100644
--- a/mysql-test/suite/innodb/t/instant_alter_debug.test
+++ b/mysql-test/suite/innodb/t/instant_alter_debug.test
@@ -512,6 +512,32 @@ SET GLOBAL innodb_limit_optimistic_insert_debug=@save_limit;
 SELECT * FROM t1;
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-25236 Online log apply fails for ROW_FORMAT=REDUNDANT tables
+--echo #
+
+CREATE TABLE t1
+(a INT NOT NULL, b INT, c INT, d INT, e INT, f INT, g INT, h INT, i TEXT)
+ENGINE=InnoDB;
+
+ALTER TABLE t1 MODIFY a INT NULL;
+
+SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL alter WAIT_FOR go';
+send ALTER TABLE t1 ADD PRIMARY KEY (a);
+connect(con1,localhost,root,,);
+set DEBUG_SYNC='now WAIT_FOR alter';
+BEGIN;
+INSERT INTO t1 SET a=0, i=REPEAT('1', 10000);
+ROLLBACK;
+set DEBUG_SYNC='now SIGNAL go';
+connection default;
+reap;
+
+disconnect con1;
+SELECT * FROM t1;
+DROP TABLE t1;
+SET DEBUG_SYNC=RESET;
+
 --echo # End of 10.4 tests
 
 --echo #