Merge 10.1 into 10.2

3 files changed, 13 insertions, 55 deletions

diff --git a/mysql-test/suite/innodb/r/innodb-enlarge-blob.result b/mysql-test/suite/innodb/r/innodb-enlarge-blob.result
index e74e954e360..8c8e9cf5007 100644
--- a/mysql-test/suite/innodb/r/innodb-enlarge-blob.result
+++ b/mysql-test/suite/innodb/r/innodb-enlarge-blob.result
@@ -1,37 +1,17 @@
-CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB DEFAULT CHARSET=UTF8 ROW_FORMAT=DYNAMIC;
+CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B');
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-UPDATE t1 SET a=CONCAT(a, RAND(), a);
+INSERT INTO t1 SET a=CONCAT('A', SPACE(8000), 'B');
+INSERT INTO t1 SELECT a FROM t1;
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 SELECT * from t1;
 DROP TABLE t1;
-CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB DEFAULT CHARSET=UTF8 ROW_FORMAT=REDUNDANT;
+CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 SHOW WARNINGS;
 Level	Code	Message
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B');
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-UPDATE t1 SET a=CONCAT(a, RAND(), a);
+INSERT INTO t1 SET a=CONCAT('A', SPACE(8000), 'B');
+INSERT INTO t1 SELECT a FROM t1;
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 SELECT * from t1;
diff --git a/mysql-test/suite/innodb/t/innodb-enlarge-blob.opt b/mysql-test/suite/innodb/t/innodb-enlarge-blob.opt
index 4c2cd9b3e3c..7cc886cb9e5 100644
--- a/mysql-test/suite/innodb/t/innodb-enlarge-blob.opt
+++ b/mysql-test/suite/innodb/t/innodb-enlarge-blob.opt
@@ -1,6 +1,5 @@
 --innodb-file-per-table
 --innodb-file-format='Barracuda'
 --innodb-buffer-pool-size=32M
---innodb-log-file-size=32M
+--innodb-page-size=64k
 --innodb-strict-mode=OFF
-
diff --git a/mysql-test/suite/innodb/t/innodb-enlarge-blob.test b/mysql-test/suite/innodb/t/innodb-enlarge-blob.test
index 84c23465a5c..65a64d299be 100644
--- a/mysql-test/suite/innodb/t/innodb-enlarge-blob.test
+++ b/mysql-test/suite/innodb/t/innodb-enlarge-blob.test
@@ -1,24 +1,13 @@
 --source include/have_innodb.inc
---source include/innodb_page_size.inc
 
 #
 # MDEV-13227: Assertion failure len < 16384 in file rem0rec.cc line 1285
 # Crashes with innodb_page_size=64K. Does not crash at <= 32K.
 #
-CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB DEFAULT CHARSET=UTF8 ROW_FORMAT=DYNAMIC;
+CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B');
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-UPDATE t1 SET a=CONCAT(a, RAND(), a);
+INSERT INTO t1 SET a=CONCAT('A', SPACE(8000), 'B');
+INSERT INTO t1 SELECT a FROM t1;
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 # random data no output we are only interested if fails
@@ -27,20 +16,10 @@ SELECT * from t1;
 --enable_result_log
 DROP TABLE t1;
 
-CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB DEFAULT CHARSET=UTF8 ROW_FORMAT=REDUNDANT;
+CREATE TABLE t1 (a LONGTEXT) ENGINE=INNODB ROW_FORMAT=DYNAMIC;
 SHOW WARNINGS;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B');
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-INSERT INTO t1 SELECT CONCAT('A', SPACE(4087), 'B') FROM t1;
-UPDATE t1 SET a=CONCAT(a, RAND(), a);
+INSERT INTO t1 SET a=CONCAT('A', SPACE(8000), 'B');
+INSERT INTO t1 SELECT a FROM t1;
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 UPDATE t1 SET a=CONCAT(a, RAND(), a);
 # random data no output we are only interested if fails