MDEV-6701: InnoDB tests fail in 10.1

Fixed test failures seen on defragment tests, innodb.innodb-wl5522-debug-zip
and innodb.innodb_bug12902967.

1 files changed, 12 insertions, 7 deletions

diff --git a/mysql-test/suite/innodb/r/innodb_defragment_fill_factor.result b/mysql-test/suite/innodb/r/innodb_defragment_fill_factor.result
index 90dcbc004f7..7c153eaaa93 100644
--- a/mysql-test/suite/innodb/r/innodb_defragment_fill_factor.result
+++ b/mysql-test/suite/innodb/r/innodb_defragment_fill_factor.result
@@ -14,13 +14,14 @@ count(*)
 # A few more insertions on the page should not cause a page split.
 insert into t1 values (81, REPEAT('A', 256));
 insert into t1 values (83, REPEAT('A', 256));
+# More insertions will cause page splits
+insert into t1 values (88, REPEAT('A', 50));
+insert into t1 values (85, REPEAT('A', 256));
+insert into t1 values (84, REPEAT('A', 256));
 insert into t1 values (87, REPEAT('A', 256));
+insert into t1 values (89, REPEAT('A', 256));
 insert into t1 values (82, REPEAT('A', 256));
 insert into t1 values (86, REPEAT('A', 256));
-# More insertions will cause page splits
-insert into t1 values (88, REPEAT('A', 50));
-Too much space are reserved on primary index.
-Too much space are reserved on second index.
 DROP TABLE t1;
 Testing table with small records
 CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b VARchar(16), KEY SECOND(a,b)) ENGINE=INNODB;
@@ -48,12 +49,16 @@ insert into t2 values(1197, REPEAT('A', 16));
 insert into t2 values(1188, REPEAT('A', 16));
 insert into t2 values(1198, REPEAT('A', 16));
 insert into t2 values(1189, REPEAT('A', 16));
-insert into t2 values(1199, REPEAT('A', 16));
-insert into t2 values(1190, REPEAT('A', 16));
-insert into t2 values(1180, REPEAT('A', 16));
 More insertions will cause page split.
 insert into t2 values(1280, REPEAT('A', 16));
 insert into t2 values(1290, REPEAT('A', 16));
 insert into t2 values(1281, REPEAT('A', 16));
 insert into t2 values(1291, REPEAT('A', 16));
+insert into t2 values(1199, REPEAT('A', 16));
+insert into t2 values(1190, REPEAT('A', 16));
+insert into t2 values(1180, REPEAT('A', 16));
+insert into t2 values(1295, REPEAT('A', 16));
+insert into t2 values(1294, REPEAT('A', 16));
+insert into t2 values(1292, REPEAT('A', 16));
+insert into t2 values(1293, REPEAT('A', 16));
 DROP TABLE t2;