Merge 10.11 into 11.4

2025-08-08 11:22:35 +03:00 · 2025-01-09 07:58:08 +02:00
parent 437550b7cf 28b2958082
commit 17f01186f5
473 changed files with 4731 additions and 3149 deletions
--- a/mysql-test/suite/innodb/r/alter_copy_bulk.result
+++ b/mysql-test/suite/innodb/r/alter_copy_bulk.result
@@ -66,4 +66,28 @@ SELECT COUNT(*) FROM t;
 COUNT(*)
 2
 DROP TABLE t1, t2, t;
+#
+#  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+#            failed in cmp_rec_rec_simple_field
+#
+CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+(REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+(REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+(REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+(REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+(REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+(REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+(REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+(REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+(REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+(REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+(REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+(REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+(REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+(REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+(REPEAT('x',65535),'dd');
+ALTER TABLE t1 FORCE, ALGORITHM=COPY;
+DROP TABLE t1;
 SET GLOBAL innodb_stats_persistent=@default_stats_persistent;
--- a/mysql-test/suite/innodb/r/innodb-64k-crash,dynamic.rdiff
+++ b/mysql-test/suite/innodb/r/innodb-64k-crash,dynamic.rdiff
@@ -0,0 +1,8 @@
+--- innodb-64k-crash.result	2024-11-28 10:37:26.491384671 +0530
+++ innodb-64k-crash.reject	2024-11-28 11:05:46.461405444 +0530
+@@ -334,5 +334,4 @@
+ REPEAT('s', 1024), REPEAT('t', 1024),
+ REPEAT('u', 1024), REPEAT('v', 1024),
+ REPEAT('w', 1024), REPEAT('x', 1024));
+-ERROR 42000: Row size too large (> 16383). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+ DROP TABLE t1;
--- a/mysql-test/suite/innodb/r/innodb-64k-crash,redundant.rdiff
+++ b/mysql-test/suite/innodb/r/innodb-64k-crash,redundant.rdiff
@@ -0,0 +1,52 @@
+--- innodb-64k-crash.result	2024-11-28 10:37:26.491384671 +0530
+++ innodb-64k-crash.reject	2024-11-28 11:10:13.381250612 +0530
+@@ -290,49 +290,3 @@
+ #  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+ #               failed in cmp_rec_rec_simple_field
+ #
+-CREATE TABLE t1(f1 int not null, f2 text, f3 text, f4 text,
+-f5 text, f6 text, f7 text, f8 text,
+-f9 text, f10 text, f11 text, f12 text,
+-f13 text, f14 text, f15 text, f16 text,
+-f17 text, f18 text, f19 text, f20 text,
+-f21 text, f22 text, f23 text, f24 text,
+-f25 text, PRIMARY KEY(f1))ENGINE=InnoDB;
+-SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
+-INSERT INTO t1 VALUES(1, REPEAT('a', 1024), REPEAT('b', 1024),
+-REPEAT('c', 1024), REPEAT('d', 1024),
+-REPEAT('e', 1024), REPEAT('f', 1024),
+-REPEAT('g', 4096), REPEAT('h', 1024),
+-REPEAT('i', 1024), REPEAT('j', 1024),
+-REPEAT('k', 1024), REPEAT('l', 1024),
+-REPEAT('m', 1024), REPEAT('n', 1024),
+-REPEAT('o', 1024), REPEAT('p', 1024),
+-REPEAT('q', 1024), REPEAT('r', 1024),
+-REPEAT('s', 1024), REPEAT('t', 1024),
+-REPEAT('u', 1024), REPEAT('v', 1024),
+-REPEAT('w', 1024), REPEAT('x', 1024)),
+-(2, REPEAT('a', 1024), REPEAT('b', 1024),
+-REPEAT('c', 1024), REPEAT('d', 1024),
+-REPEAT('e', 1024), REPEAT('f', 1024),
+-REPEAT('g', 4096), REPEAT('h', 1024),
+-REPEAT('i', 1024), REPEAT('j', 1024),
+-REPEAT('k', 1024), REPEAT('l', 1024),
+-REPEAT('m', 1024), REPEAT('n', 1024),
+-REPEAT('o', 1024), REPEAT('p', 1024),
+-REPEAT('q', 1024), REPEAT('r', 1024),
+-REPEAT('s', 1024), REPEAT('t', 1024),
+-REPEAT('u', 1024), REPEAT('v', 1024),
+-REPEAT('w', 1024), REPEAT('x', 1024)),
+-(3, REPEAT('a', 1024), REPEAT('b', 1024),
+-REPEAT('c', 1024), REPEAT('d', 1024),
+-REPEAT('e', 1024), REPEAT('f', 1024),
+-REPEAT('g', 4096), REPEAT('h', 1024),
+-REPEAT('i', 1024), REPEAT('j', 1024),
+-REPEAT('k', 1024), REPEAT('l', 1024),
+-REPEAT('m', 1024), REPEAT('n', 1024),
+-REPEAT('o', 1024), REPEAT('p', 1024),
+-REPEAT('q', 1024), REPEAT('r', 1024),
+-REPEAT('s', 1024), REPEAT('t', 1024),
+-REPEAT('u', 1024), REPEAT('v', 1024),
+-REPEAT('w', 1024), REPEAT('x', 1024));
+-ERROR 42000: Row size too large (> 16383). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+-DROP TABLE t1;
--- a/mysql-test/suite/innodb/r/innodb-64k-crash.result
+++ b/mysql-test/suite/innodb/r/innodb-64k-crash.result
@@ -286,3 +286,53 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 test.t2	check	status	OK
 drop table t1,t2;
+#
+#  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+#               failed in cmp_rec_rec_simple_field
+#
+CREATE TABLE t1(f1 int not null, f2 text, f3 text, f4 text,
+f5 text, f6 text, f7 text, f8 text,
+f9 text, f10 text, f11 text, f12 text,
+f13 text, f14 text, f15 text, f16 text,
+f17 text, f18 text, f19 text, f20 text,
+f21 text, f22 text, f23 text, f24 text,
+f25 text, PRIMARY KEY(f1))ENGINE=InnoDB;
+SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
+INSERT INTO t1 VALUES(1, REPEAT('a', 1024), REPEAT('b', 1024),
+REPEAT('c', 1024), REPEAT('d', 1024),
+REPEAT('e', 1024), REPEAT('f', 1024),
+REPEAT('g', 4096), REPEAT('h', 1024),
+REPEAT('i', 1024), REPEAT('j', 1024),
+REPEAT('k', 1024), REPEAT('l', 1024),
+REPEAT('m', 1024), REPEAT('n', 1024),
+REPEAT('o', 1024), REPEAT('p', 1024),
+REPEAT('q', 1024), REPEAT('r', 1024),
+REPEAT('s', 1024), REPEAT('t', 1024),
+REPEAT('u', 1024), REPEAT('v', 1024),
+REPEAT('w', 1024), REPEAT('x', 1024)),
+(2, REPEAT('a', 1024), REPEAT('b', 1024),
+REPEAT('c', 1024), REPEAT('d', 1024),
+REPEAT('e', 1024), REPEAT('f', 1024),
+REPEAT('g', 4096), REPEAT('h', 1024),
+REPEAT('i', 1024), REPEAT('j', 1024),
+REPEAT('k', 1024), REPEAT('l', 1024),
+REPEAT('m', 1024), REPEAT('n', 1024),
+REPEAT('o', 1024), REPEAT('p', 1024),
+REPEAT('q', 1024), REPEAT('r', 1024),
+REPEAT('s', 1024), REPEAT('t', 1024),
+REPEAT('u', 1024), REPEAT('v', 1024),
+REPEAT('w', 1024), REPEAT('x', 1024)),
+(3, REPEAT('a', 1024), REPEAT('b', 1024),
+REPEAT('c', 1024), REPEAT('d', 1024),
+REPEAT('e', 1024), REPEAT('f', 1024),
+REPEAT('g', 4096), REPEAT('h', 1024),
+REPEAT('i', 1024), REPEAT('j', 1024),
+REPEAT('k', 1024), REPEAT('l', 1024),
+REPEAT('m', 1024), REPEAT('n', 1024),
+REPEAT('o', 1024), REPEAT('p', 1024),
+REPEAT('q', 1024), REPEAT('r', 1024),
+REPEAT('s', 1024), REPEAT('t', 1024),
+REPEAT('u', 1024), REPEAT('v', 1024),
+REPEAT('w', 1024), REPEAT('x', 1024));
+ERROR 42000: Row size too large (> 16383). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+DROP TABLE t1;
--- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
@@ -451,7 +451,7 @@ restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug=@saved_debug_dbug;
 SET SESSION debug_dbug="+d,ib_import_open_tablespace_failure";
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Got error 42 'Tablespace not found' from ./test/t1.ibd
+ERROR HY000: Got error 41 'Tablespace not found' from ./test/t1.ibd
 SET SESSION debug_dbug=@saved_debug_dbug;
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_cluster_root_adjust_failure";
--- a/mysql-test/suite/innodb/r/insert_into_empty,32k.rdiff
+++ b/mysql-test/suite/innodb/r/insert_into_empty,32k.rdiff
@@ -1,4 +1,6 @@
-@@ -377,8 +377,6 @@
+--- insert_into_empty.result
+++ insert_into_empty,32k.result
+@@ -446,12 +446,9 @@
 c09 text, c10 text, c11 text, c12 text) ENGINE=InnoDB;
 SET GLOBAL INNODB_DEFAULT_ROW_FORMAT= COMPACT;
 ALTER TABLE t1 FORCE;
@@ -7,3 +9,7 @@
 INSERT IGNORE INTO t1 VALUES
 (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
 (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+ CHECK TABLE t1;
+ Table	Op	Msg_type	Msg_text
+ test.t1	check	status	OK
--- a/mysql-test/suite/innodb/r/insert_into_empty,4k.rdiff
+++ b/mysql-test/suite/innodb/r/insert_into_empty,4k.rdiff
@@ -1,10 +1,40 @@
--- a/mysql-test/suite/innodb/r/insert_into_empty.result
-+++ b/mysql-test/suite/innodb/r/insert_into_empty.result
-@@ -430,6 +430,7 @@
+--- insert_into_empty.result
+++ insert_into_empty,4k.result
+@@ -451,7 +451,7 @@
 INSERT IGNORE INTO t1 VALUES
 (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
 (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
 +ERROR 42000: Row size too large (> 1982). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+@@ -542,28 +542,6 @@
+ commit;
+ DROP TABLE t1;
+ #
+-#  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+-#               failed in cmp_rec_rec_simple_field
+-#
+-CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+-INSERT INTO t1 VALUES (REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+-(REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+-(REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+-(REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+-(REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+-(REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+-(REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+-(REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+-(REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+-(REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+-(REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+-(REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+-(REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+-(REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+-(REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+-(REPEAT('x',65535),'dd');
+-DROP TABLE t1;
+-#
+ #  Assertion `page_dir_get_n_heap(new_page) == 2U' failed
+ #                  in dberr_t PageBulk::init()
+ #
--- a/mysql-test/suite/innodb/r/insert_into_empty,64k.rdiff
+++ b/mysql-test/suite/innodb/r/insert_into_empty,64k.rdiff
@@ -1,4 +1,6 @@
-@@ -377,8 +377,6 @@
+--- insert_into_empty.result
+++ insert_into_empty,64k.result
+@@ -446,12 +446,9 @@
 c09 text, c10 text, c11 text, c12 text) ENGINE=InnoDB;
 SET GLOBAL INNODB_DEFAULT_ROW_FORMAT= COMPACT;
 ALTER TABLE t1 FORCE;
@@ -7,3 +9,7 @@
 INSERT IGNORE INTO t1 VALUES
 (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
 (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+ CHECK TABLE t1;
+ Table	Op	Msg_type	Msg_text
+ test.t1	check	status	OK
--- a/mysql-test/suite/innodb/r/insert_into_empty,8k.rdiff
+++ b/mysql-test/suite/innodb/r/insert_into_empty,8k.rdiff
@@ -0,0 +1,40 @@
+--- insert_into_empty.result
+++ insert_into_empty,8k.result
+@@ -451,7 +451,7 @@
+ INSERT IGNORE INTO t1 VALUES
+ (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
+ (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+ERROR 42000: Row size too large (> 4030). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+ CHECK TABLE t1;
+ Table	Op	Msg_type	Msg_text
+ test.t1	check	status	OK
+@@ -542,28 +542,6 @@
+ commit;
+ DROP TABLE t1;
+ #
+-#  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+-#               failed in cmp_rec_rec_simple_field
+-#
+-CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+-INSERT INTO t1 VALUES (REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+-(REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+-(REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+-(REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+-(REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+-(REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+-(REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+-(REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+-(REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+-(REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+-(REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+-(REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+-(REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+-(REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+-(REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+-(REPEAT('x',65535),'dd');
+-DROP TABLE t1;
+-#
+ #  Assertion `page_dir_get_n_heap(new_page) == 2U' failed
+ #                  in dberr_t PageBulk::init()
+ #
--- a/mysql-test/suite/innodb/r/insert_into_empty.result
+++ b/mysql-test/suite/innodb/r/insert_into_empty.result
@@ -451,6 +451,7 @@ Warning	139	Row size too large (> 8126). Changing some columns to TEXT or BLOB o
 INSERT IGNORE INTO t1 VALUES
 (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
 (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -540,4 +541,43 @@ INSERT INTO t1 VALUES(2,0);
 DELETE FROM t1;
 commit;
 DROP TABLE t1;
+#
+#  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+#               failed in cmp_rec_rec_simple_field
+#
+CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+(REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+(REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+(REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+(REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+(REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+(REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+(REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+(REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+(REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+(REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+(REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+(REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+(REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+(REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+(REPEAT('x',65535),'dd');
+DROP TABLE t1;
+#
+#  Assertion `page_dir_get_n_heap(new_page) == 2U' failed
+#                  in dberr_t PageBulk::init()
+#
+CREATE TABLE t1(f1 INT)ENGINE=InnoDB PARTITION BY RANGE (f1) (PARTITION p0 VALUES LESS THAN (100));
+SET @old_bulk_op=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_bulk_operations');
+BEGIN;
+INSERT INTO t1 SELECT seq FROM seq_1_to_1;
+COMMIT;
+SELECT variable_value-@old_bulk_op bulk_operations
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_bulk_operations';
+bulk_operations
+1
+DROP TABLE t1;
 # End of 10.11 tests
--- a/mysql-test/suite/innodb/r/log_file_size_online.result
+++ b/mysql-test/suite/innodb/r/log_file_size_online.result
@@ -19,7 +19,7 @@ SHOW VARIABLES LIKE 'innodb_log_file_size';
 Variable_name	Value
 innodb_log_file_size	4194304
 FOUND 1 /InnoDB: Resized log to 4\.000MiB/ in mysqld.1.err
-SET @save=@@GLOBAL.innodb_log_file_buffering;
+SET @save=@@global.innodb_log_file_buffering;
 SET GLOBAL innodb_log_file_buffering=OFF;
 SET GLOBAL innodb_log_file_buffering=ON;
 SET GLOBAL innodb_log_file_buffering=@save;
--- a/mysql-test/suite/innodb/t/alter_copy_bulk.test
+++ b/mysql-test/suite/innodb/t/alter_copy_bulk.test
@@ -83,4 +83,29 @@ CREATE TABLE t engine=innodb
 SELECT t2.f2 FROM t2 JOIN t1 ON t1.f1 = t2.f1 AND t1.f3 = '' AND t1.f2=1 ;
 SELECT COUNT(*) FROM t;
 DROP TABLE t1, t2, t;
+
+--echo #
+--echo #  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+--echo #            failed in cmp_rec_rec_simple_field
+--echo #
+CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+ (REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+ (REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+ (REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+ (REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+ (REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+ (REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+ (REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+ (REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+ (REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+ (REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+ (REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+ (REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+ (REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+ (REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+ (REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+ (REPEAT('x',65535),'dd');
+ALTER TABLE t1 FORCE, ALGORITHM=COPY;
+DROP TABLE t1;
 SET GLOBAL innodb_stats_persistent=@default_stats_persistent;
--- a/mysql-test/suite/innodb/t/autoinc_debug.test
+++ b/mysql-test/suite/innodb/t/autoinc_debug.test
@@ -3,6 +3,10 @@
 --source include/have_debug_sync.inc
 --source include/not_embedded.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Two parallel connection with autoinc column after restart.

 CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY)ENGINE=INNODB;
--- a/mysql-test/suite/innodb/t/deadlock_detect.test
+++ b/mysql-test/suite/innodb/t/deadlock_detect.test
@@ -5,6 +5,10 @@
 --source include/have_innodb.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 let $have_deadlock=`select @@GLOBAL.innodb_deadlock_detect`;

 connection default;
--- a/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test
+++ b/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test
@@ -1,6 +1,10 @@
 --source include/have_innodb.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t1 (
  pkey int NOT NULL PRIMARY KEY,
  c int
--- a/mysql-test/suite/innodb/t/deadlock_victim_race.test
+++ b/mysql-test/suite/innodb/t/deadlock_victim_race.test
@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --connect(cancel_purge,localhost,root,,)
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point
--- a/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test
+++ b/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test
@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point
 # lock_trx_handle_wait_enter, waiting for upd_cont signal, which must be
--- a/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test
+++ b/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test
@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point
 # lock_trx_handle_wait_enter, waiting for upd_cont signal, which must be
--- a/mysql-test/suite/innodb/t/foreign_key.test
+++ b/mysql-test/suite/innodb/t/foreign_key.test
@@ -2,6 +2,10 @@
 --source include/count_sessions.inc
 --source include/default_charset.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 SET GLOBAL innodb_stats_persistent = 0;

 --echo #
--- a/mysql-test/suite/innodb/t/innodb-64k-crash.opt
+++ b/mysql-test/suite/innodb/t/innodb-64k-crash.opt
@@ -0,0 +1 @@
+--innodb_sort_buffer_size=65536
--- a/mysql-test/suite/innodb/t/innodb-64k-crash.test
+++ b/mysql-test/suite/innodb/t/innodb-64k-crash.test
@@ -2,6 +2,7 @@
 --source include/have_innodb_64k.inc
 # Embedded server does not support restarting
 --source include/not_embedded.inc
+--source innodb_default_row_format.inc

 let $MYSQLD_DATADIR= `select @@datadir`;

@@ -314,3 +315,64 @@ connection default;

 check table t1,t2;
 drop table t1,t2;
+
+--echo #
+--echo #  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+--echo #               failed in cmp_rec_rec_simple_field
+--echo #
+let $row_format= `select @@global.innodb_default_row_format`;
+if ($row_format != "redundant")
+{
+CREATE TABLE t1(f1 int not null, f2 text, f3 text, f4 text,
+                f5 text, f6 text, f7 text, f8 text,
+                f9 text, f10 text, f11 text, f12 text,
+                f13 text, f14 text, f15 text, f16 text,
+                f17 text, f18 text, f19 text, f20 text,
+                f21 text, f22 text, f23 text, f24 text,
+                f25 text, PRIMARY KEY(f1))ENGINE=InnoDB;
+let $error_code = ER_TOO_BIG_ROWSIZE;
+if ($row_format == "dynamic")
+{
+  let $error_code = 0;
+}
+
+--error $error_code
+SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
+INSERT INTO t1 VALUES(1, REPEAT('a', 1024), REPEAT('b', 1024),
+                      REPEAT('c', 1024), REPEAT('d', 1024),
+                      REPEAT('e', 1024), REPEAT('f', 1024),
+                      REPEAT('g', 4096), REPEAT('h', 1024),
+                      REPEAT('i', 1024), REPEAT('j', 1024),
+                      REPEAT('k', 1024), REPEAT('l', 1024),
+                      REPEAT('m', 1024), REPEAT('n', 1024),
+                      REPEAT('o', 1024), REPEAT('p', 1024),
+                      REPEAT('q', 1024), REPEAT('r', 1024),
+                      REPEAT('s', 1024), REPEAT('t', 1024),
+                      REPEAT('u', 1024), REPEAT('v', 1024),
+                      REPEAT('w', 1024), REPEAT('x', 1024)),
+                     (2, REPEAT('a', 1024), REPEAT('b', 1024),
+                      REPEAT('c', 1024), REPEAT('d', 1024),
+                      REPEAT('e', 1024), REPEAT('f', 1024),
+                      REPEAT('g', 4096), REPEAT('h', 1024),
+                      REPEAT('i', 1024), REPEAT('j', 1024),
+                      REPEAT('k', 1024), REPEAT('l', 1024),
+                      REPEAT('m', 1024), REPEAT('n', 1024),
+                      REPEAT('o', 1024), REPEAT('p', 1024),
+                      REPEAT('q', 1024), REPEAT('r', 1024),
+                      REPEAT('s', 1024), REPEAT('t', 1024),
+                     REPEAT('u', 1024), REPEAT('v', 1024),
+                      REPEAT('w', 1024), REPEAT('x', 1024)),
+                     (3, REPEAT('a', 1024), REPEAT('b', 1024),
+                      REPEAT('c', 1024), REPEAT('d', 1024),
+                      REPEAT('e', 1024), REPEAT('f', 1024),
+                      REPEAT('g', 4096), REPEAT('h', 1024),
+                      REPEAT('i', 1024), REPEAT('j', 1024),
+                      REPEAT('k', 1024), REPEAT('l', 1024),
+                      REPEAT('m', 1024), REPEAT('n', 1024),
+                      REPEAT('o', 1024), REPEAT('p', 1024),
+                      REPEAT('q', 1024), REPEAT('r', 1024),
+                      REPEAT('s', 1024), REPEAT('t', 1024),
+                      REPEAT('u', 1024), REPEAT('v', 1024),
+                      REPEAT('w', 1024), REPEAT('x', 1024));
+DROP TABLE t1;
+}
--- a/mysql-test/suite/innodb/t/innodb-lock.test
+++ b/mysql-test/suite/innodb/t/innodb-lock.test
@@ -1,6 +1,10 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # Check and select innodb lock type
 #
--- a/mysql-test/suite/innodb/t/innodb_bug42419.test
+++ b/mysql-test/suite/innodb/t/innodb_bug42419.test
@@ -4,6 +4,10 @@
 # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections
 #

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --source include/not_embedded.inc

 let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);
--- a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
+++ b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
@@ -1,5 +1,9 @@
 --source include/have_innodb.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # Bug #41453: Assertion `m_status == DA_ERROR' failed in
 # Diagnostics_area::sql_errno
--- a/mysql-test/suite/innodb/t/innodb_trx_weight.test
+++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -6,6 +6,10 @@
 # be heavier than ones that had not.
 #

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 -- source include/have_innodb.inc

 SET default_storage_engine=InnoDB;
--- a/mysql-test/suite/innodb/t/insert-before-delete.test
+++ b/mysql-test/suite/innodb/t/insert-before-delete.test
@@ -3,6 +3,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --connect (pause_purge,localhost,root)
 START TRANSACTION WITH CONSISTENT SNAPSHOT;

--- a/mysql-test/suite/innodb/t/insert_into_empty.test
+++ b/mysql-test/suite/innodb/t/insert_into_empty.test
@@ -484,7 +484,7 @@ ALTER TABLE t1 FORCE;
 let $page_size= `SELECT @@innodb_page_size`;
 let $error_code = 0;

-if ($page_size == 4096) {
+if ($page_size <= 16384) {
 let $error_code = ER_TOO_BIG_ROWSIZE;
 }

@@ -593,4 +593,49 @@ INSERT INTO t1 VALUES(2,0);
 DELETE FROM t1;
 commit;
 DROP TABLE t1;
+
+
+if ($page_size >= 16384) {
+--echo #
+--echo #  MDEV-35475 Assertion `!rec_offs_nth_extern(offsets1, n)'
+--echo #               failed in cmp_rec_rec_simple_field
+--echo #
+CREATE TABLE t1(a BLOB, b VARCHAR(2048), PRIMARY KEY (b)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (REPEAT('x',4805),'a'), (REPEAT('x',16111),'b'),
+                      (REPEAT('x',65535),'c'), (REPEAT('x',11312),'d'),
+                      (REPEAT('x',35177),'e'), (REPEAT('x',65535),'f'),
+                      (REPEAT('x',1988),'g'), (NULL,REPEAT('x',2048)),
+                      (REPEAT('x',2503),'h'), (REPEAT('x',33152),'i'),
+		      (REPEAT('x',65535),'j'), (REPEAT('x',1988),'k'),
+		      (REPEAT('x',65535),'l'), (REPEAT('x',65535),'m'),
+		      (REPEAT('x',65535),'n'), (REPEAT('x',65535),'o'),
+		      (REPEAT('x',1988),'p'), (REPEAT('x',2503),'q'),
+		      (REPEAT('x',65535),'r'), (REPEAT('x',65535),'s'),
+		      (REPEAT('x',65535),'t'), (REPEAT('x',3169),'u'),
+		      (REPEAT('x',7071),'v'), (REPEAT('x',16111),'w'),
+		      (REPEAT('x',2325),'x'), (REPEAT('x',33152),'y'),
+		      (REPEAT('x',65535),'z'), (REPEAT('x',65535),'aa'),
+		      (REPEAT('x',16111),'bb'), (REPEAT('x',4805),'cc'),
+		      (REPEAT('x',65535),'dd');
+DROP TABLE t1;
+}
+
+--echo #
+--echo #  Assertion `page_dir_get_n_heap(new_page) == 2U' failed
+--echo #                  in dberr_t PageBulk::init()
+--echo #
+CREATE TABLE t1(f1 INT)ENGINE=InnoDB PARTITION BY RANGE (f1) (PARTITION p0 VALUES LESS THAN (100));
+
+SET @old_bulk_op=
+(SELECT variable_value FROM information_schema.global_status
+WHERE variable_name = 'innodb_bulk_operations');
+
+BEGIN;
+INSERT INTO t1 SELECT seq FROM seq_1_to_1;
+COMMIT;
+
+SELECT variable_value-@old_bulk_op bulk_operations
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_bulk_operations';
+DROP TABLE t1;
 --echo # End of 10.11 tests
--- a/mysql-test/suite/innodb/t/lock_delete_updated.test
+++ b/mysql-test/suite/innodb/t/lock_delete_updated.test
@@ -3,6 +3,10 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t VALUES (3);

--- a/mysql-test/suite/innodb/t/lock_isolation.test
+++ b/mysql-test/suite/innodb/t/lock_isolation.test
@@ -1,5 +1,9 @@
 --source include/have_innodb.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --echo #
 --echo # MDEV-26642 Weird SELECT view when a record is
 --echo #            modified to the same value by two transactions
--- a/mysql-test/suite/innodb/t/lock_memory_debug.test
+++ b/mysql-test/suite/innodb/t/lock_memory_debug.test
@@ -6,6 +6,9 @@
 --echo #

 call mtr.add_suppression("\\[Warning\\] InnoDB: Over 67 percent of the buffer pool");
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log

 CREATE TABLE t1 (col1 INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
--- a/mysql-test/suite/innodb/t/log_file_size_online.test
+++ b/mysql-test/suite/innodb/t/log_file_size_online.test
@@ -26,7 +26,7 @@ let SEARCH_PATTERN = InnoDB: Resized log to 4\\.000MiB;
 --source include/search_pattern_in_file.inc

 --error 0,ER_UNKNOWN_SYSTEM_VARIABLE
-SET @save=@@GLOBAL.innodb_log_file_buffering;
+SET @save=@@global.innodb_log_file_buffering;
 --error 0,ER_UNKNOWN_SYSTEM_VARIABLE
 SET GLOBAL innodb_log_file_buffering=OFF;
 --error 0,ER_UNKNOWN_SYSTEM_VARIABLE
--- a/mysql-test/suite/innodb/t/mdev-14846.test
+++ b/mysql-test/suite/innodb/t/mdev-14846.test
@@ -4,6 +4,10 @@

 --source include/innodb_stable_estimates.inc

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t1 (
 pk INT,
 f1 VARCHAR(10) NOT NULL,
--- a/mysql-test/suite/innodb/t/row_lock.test
+++ b/mysql-test/suite/innodb/t/row_lock.test
@@ -4,6 +4,10 @@
 # concurrent CREATE OR REPLACE and transactional UPDATE
 #

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --source include/have_innodb.inc

 CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB;
--- a/mysql-test/suite/innodb/t/stat_tables.test
+++ b/mysql-test/suite/innodb/t/stat_tables.test
@@ -1,5 +1,9 @@
 source include/have_innodb.inc;

+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # MDEV-20354 All but last insert ignored in InnoDB tables when table locked
 #