--- max_record_size.result	2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject	2019-07-03 12:58:58.318768169 +0300
@@ -1,47 +1,37 @@
 call mtr.add_suppression("Cannot add field `.*` in table `test`.`t1` because after adding it, the row size is");
 CREATE TABLE t1 (
 c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
-c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),
-c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255),
-c13 CHAR(255), c14 CHAR(255), c15 CHAR(255)
+c5 CHAR(255), c6 CHAR(255), c7 CHAR(255)
 ) ENGINE=INNODB;
 DROP TABLE t1;
 CREATE TABLE t1 (
 c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
-c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),
-c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255),
-c13 CHAR(255), c14 CHAR(255), c15 CHAR(255), c16 CHAR(255)
+c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255)
 ) ENGINE=INNODB;
-ERROR 42000: Row size too large (> 4027). 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 (> 1979). 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.
 CREATE TABLE t1 (
 c1 VARCHAR(255), c2 VARCHAR(255), c3 VARCHAR(255), c4 VARCHAR(255),
-c5 VARCHAR(255), c6 VARCHAR(255), c7 VARCHAR(255), c8 VARCHAR(255),
-c9 VARCHAR(255), c10 VARCHAR(255), c11 VARCHAR(255), c12 VARCHAR(255),
-c13 VARCHAR(255), c14 VARCHAR(255), c15 VARCHAR(255)
+c5 VARCHAR(255), c6 VARCHAR(255), c7 VARCHAR(255)
 ) ENGINE=INNODB;
 DROP TABLE t1;
 CREATE TABLE t1 (
 c1 VARCHAR(255), c2 VARCHAR(255), c3 VARCHAR(255), c4 VARCHAR(255),
-c5 VARCHAR(255), c6 VARCHAR(255), c7 VARCHAR(255), c8 VARCHAR(255),
-c9 VARCHAR(255), c10 VARCHAR(255), c11 VARCHAR(255), c12 VARCHAR(255),
-c13 VARCHAR(255), c14 VARCHAR(255), c15 VARCHAR(255), c16 VARCHAR(255)
+c5 VARCHAR(255), c6 VARCHAR(255), c7 VARCHAR(255), c8 VARCHAR(255)
 ) ENGINE=INNODB;
-ERROR 42000: Row size too large (> 4027). 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 (> 1979). 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.
 CREATE TABLE t1 (
-c1 VARCHAR(788), c2 VARCHAR(788), c3 VARCHAR(788), c4 VARCHAR(788),
-c5 VARCHAR(788)
+c1 VARCHAR(788), c2 VARCHAR(788)
 ) ENGINE=INNODB;
 DROP TABLE t1;
 CREATE TABLE t1 (
-c1 VARCHAR(788), c2 VARCHAR(788), c3 VARCHAR(788), c4 VARCHAR(788),
-c5 VARCHAR(788), c6 VARCHAR(788)
+c1 VARCHAR(788), c2 VARCHAR(788), c3 VARCHAR(788)
 ) ENGINE=INNODB;
-ERROR 42000: Row size too large (> 4027). 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 (> 1979). 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.
 CREATE TABLE t1 (
-c1 TEXT, c2 TEXT, c3 TEXT, c4 TEXT, c5 TEXT
+c1 TEXT, c2 TEXT
 ) ENGINE=INNODB;
 DROP TABLE t1;
 CREATE TABLE t1 (
-c1 TEXT, c2 TEXT, c3 TEXT, c4 TEXT, c5 TEXT, c6 TEXT
+c1 TEXT, c2 TEXT, c3 TEXT
 ) ENGINE=INNODB;
-ERROR 42000: Row size too large (> 4027). 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 (> 1979). 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.