MDEV-20949: Merge 10.3 into 10.4

2 files changed, 21 insertions, 1 deletions

diff --git a/mysql-test/suite/innodb/t/instant_alter.test b/mysql-test/suite/innodb/t/instant_alter.test
index c4be8c19f5c..8fc8fe6cd6d 100644
--- a/mysql-test/suite/innodb/t/instant_alter.test
+++ b/mysql-test/suite/innodb/t/instant_alter.test
@@ -46,6 +46,7 @@ SET @old_instant=
 WHERE variable_name = 'innodb_instant_alter_column');
 
 let $format= 3;
+let $redundant_4k= `SELECT @@GLOBAL.innodb_page_size=4096`;
 while ($format) {
 let $engine= `SELECT CONCAT('ENGINE=InnoDB ROW_FORMAT=',CASE $format
 WHEN 1 THEN 'DYNAMIC'
@@ -196,9 +197,19 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
 WHERE name = 'test/t2';
 connection default;
 
+if ($redundant_4k)
+{
+--error ER_TOO_BIG_ROWSIZE
+ALTER TABLE t2 DROP p;
+SET innodb_strict_mode = OFF;
+}
 --enable_info
 ALTER TABLE t2 DROP p;
 --disable_info
+if ($redundant_4k)
+{
+SET innodb_strict_mode = ON;
+}
 SELECT * FROM t2;
 
 # datetime
@@ -223,6 +234,13 @@ SELECT id, c2, ST_AsText(c3) c3, c4, c5, c6, c7, c8 FROM t3;
 --enable_info
 ALTER TABLE t3 ADD COLUMN t TEXT CHARSET utf8
 DEFAULT 'The quick brown fox jumps over the lazy dog';
+
+if ($redundant_4k)
+{
+--error ER_TOO_BIG_ROWSIZE
+ALTER TABLE t3 ADD COLUMN b BLOB NOT NULL;
+SET innodb_strict_mode = OFF;
+}
 ALTER TABLE t3 ADD COLUMN b BLOB NOT NULL;
 --error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t3 SET id=4;
@@ -236,7 +254,6 @@ INSERT INTO t3 SET id=5, c2=9;
 SELECT id, c2, ST_AsText(c3) c3, c4, c5, c6, c7, c8, phrase, b FROM t3;
 --enable_info
 ALTER TABLE t3 DROP c3, DROP c7;
-SET innodb_strict_mode = OFF;
 --disable_info
 SELECT * FROM t3;
 
@@ -774,6 +791,7 @@ SELECT * FROM t1;
 DROP TABLE t1;
 
 dec $format;
+let $redundant_4k= 0;
 }
 disconnect analyze;
 SELECT variable_value-@old_instant instants
diff --git a/mysql-test/suite/innodb/t/instant_alter_limit.test b/mysql-test/suite/innodb/t/instant_alter_limit.test
index b50a1b15295..e84885f88e7 100644
--- a/mysql-test/suite/innodb/t/instant_alter_limit.test
+++ b/mysql-test/suite/innodb/t/instant_alter_limit.test
@@ -7,7 +7,9 @@ WHERE variable_name = 'innodb_instant_alter_column');
 CREATE TABLE t(a INT PRIMARY KEY, b INT, c INT, d INT, e INT)
 ENGINE=InnoDB;
 INSERT INTO t VALUES(1,2,3,4,5);
+SET innodb_strict_mode = OFF;
 --disable_query_log
+call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot add .* in table `test`\\.`t` because after adding it, the row size");
 let $n=253;
 while ($n) {
 dec $n;