Remove references to innodb_file_format.

innodb_file_format=Barracuda is the default in MariaDB 10.2.
Do not set it, because the option will be removed in MariaDB 10.3.

Also, do not set innodb_file_per_table=1 because it is the default.

Note that MDEV-11828 should fix the test innodb.innodb-64k
already in 10.1.

1 files changed, 219 insertions, 223 deletions

diff --git a/mysql-test/suite/innodb/r/innodb-32k.result b/mysql-test/suite/innodb/r/innodb-32k.result
index 2253ba5588f..29374689a3b 100644
--- a/mysql-test/suite/innodb/r/innodb-32k.result
+++ b/mysql-test/suite/innodb/r/innodb-32k.result
@@ -1,9 +1,8 @@
-call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
-call mtr.add_suppression("InnoDB: Resizing redo log from *");
-call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files.");
-call mtr.add_suppression("InnoDB: New log files created, LSN=*");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
+call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value ");
+call mtr.add_suppression("InnoDB: Resizing redo log from ");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created, LSN=");
+call mtr.add_suppression("Innodb: Cannot add field.*row size is");
 # Test 1) Show the page size from Information Schema
 SELECT variable_value FROM information_schema.global_status
 WHERE LOWER(variable_name) = 'innodb_page_size';
@@ -234,7 +233,7 @@ v=@d,w=@d,x=@d,y=@d,z=@d,
 aa=@d,ba=@d,ca=@d,da=@d,ea=@d,fa=@d,ga=@d,ha=@d,ia=@d,ja=@d,
 ka=@d,la=@d,ma=@d,na=@d,oa=@d,pa=@d,qa=@d,ra=@d,sa=@d,ta=@d,ua=@d,
 va=@d,wa=@d,xa=@d,ya=@d,za=@d;
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 BEGIN;
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d;
 UPDATE t1 SET f=@d,g=@d,h=@d,i=@d,j=@d;
@@ -278,7 +277,6 @@ CREATE INDEX tn1f9 ON t1 (oa(767));
 CREATE INDEX to1f11 ON t1 (pa(767));
 UPDATE t1 SET t=@e;
 CREATE INDEX t1f6 ON t1 (l(767));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 16318. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 drop table t1;
 Test an assertion failure on purge.
 CREATE TABLE t1_purge (
@@ -320,8 +318,6 @@ DELETE FROM t1_purge;
 DELETE FROM t2_purge;
 DELETE FROM t3_purge;
 DELETE FROM t4_purge;
-SET GLOBAL innodb_file_per_table=on;
-SET GLOBAL innodb_file_format='Barracuda';
 SET @r=REPEAT('a',500);
 CREATE TABLE tlong(a int,
 v1 varchar(500), v2 varchar(500), v3 varchar(500),
@@ -366,22 +362,22 @@ CREATE INDEX ndx_p ON tlong2 (p(500));
 SHOW CREATE TABLE tlong2;
 Table	Create Table
 tlong2	CREATE TABLE `tlong2` (
-  `a` blob,
-  `b` blob,
-  `c` blob,
-  `d` blob,
-  `e` blob,
-  `f` blob,
-  `g` blob,
-  `h` blob,
-  `i` blob,
-  `j` blob,
-  `k` blob,
-  `l` blob,
-  `m` blob,
-  `n` blob,
-  `o` blob,
-  `p` blob,
+  `a` blob DEFAULT NULL,
+  `b` blob DEFAULT NULL,
+  `c` blob DEFAULT NULL,
+  `d` blob DEFAULT NULL,
+  `e` blob DEFAULT NULL,
+  `f` blob DEFAULT NULL,
+  `g` blob DEFAULT NULL,
+  `h` blob DEFAULT NULL,
+  `i` blob DEFAULT NULL,
+  `j` blob DEFAULT NULL,
+  `k` blob DEFAULT NULL,
+  `l` blob DEFAULT NULL,
+  `m` blob DEFAULT NULL,
+  `n` blob DEFAULT NULL,
+  `o` blob DEFAULT NULL,
+  `p` blob DEFAULT NULL,
   KEY `ndx_c` (`c`(500)),
   KEY `ndx_d` (`d`(500)),
   KEY `ndx_e` (`e`(500)),
@@ -665,203 +661,203 @@ set @b = repeat('zyxwvutsrqponmlkjihgfedcba', 2000);
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `COL1` text,
-  `COL2` text,
-  `COL3` text,
-  `COL4` text,
-  `COL5` text,
-  `COL6` text,
-  `COL7` text,
-  `COL8` text,
-  `COL9` text,
-  `COL10` text,
-  `COL11` text,
-  `COL12` text,
-  `COL13` text,
-  `COL14` text,
-  `COL15` text,
-  `COL16` text,
-  `COL17` text,
-  `COL18` text,
-  `COL19` text,
-  `COL20` text,
-  `COL21` text,
-  `COL22` text,
-  `COL23` text,
-  `COL24` text,
-  `COL25` text,
-  `COL26` text,
-  `COL27` text,
-  `COL28` text,
-  `COL29` text,
-  `COL30` text,
-  `COL31` text,
-  `COL32` text,
-  `COL33` text,
-  `COL34` text,
-  `COL35` text,
-  `COL36` text,
-  `COL37` text,
-  `COL38` text,
-  `COL39` text,
-  `COL40` text,
-  `COL41` text,
-  `COL42` text,
-  `COL43` text,
-  `COL44` text,
-  `COL45` text,
-  `COL46` text,
-  `COL47` text,
-  `COL48` text,
-  `COL49` text,
-  `COL50` text,
-  `COL51` text,
-  `COL52` text,
-  `COL53` text,
-  `COL54` text,
-  `COL55` text,
-  `COL56` text,
-  `COL57` text,
-  `COL58` text,
-  `COL59` text,
-  `COL60` text,
-  `COL61` text,
-  `COL62` text,
-  `COL63` text,
-  `COL64` text,
-  `COL65` text,
-  `COL66` text,
-  `COL67` text,
-  `COL68` text,
-  `COL69` text,
-  `COL70` text,
-  `COL71` text,
-  `COL72` text,
-  `COL73` text,
-  `COL74` text,
-  `COL75` text,
-  `COL76` text,
-  `COL77` text,
-  `COL78` text,
-  `COL79` text,
-  `COL80` text,
-  `COL81` text,
-  `COL82` text,
-  `COL83` text,
-  `COL84` text,
-  `COL85` text,
-  `COL86` text,
-  `COL87` text,
-  `COL88` text,
-  `COL89` text,
-  `COL90` text,
-  `COL91` text,
-  `COL92` text,
-  `COL93` text,
-  `COL94` text,
-  `COL95` text,
-  `COL96` text,
-  `COL97` text,
-  `COL98` text,
-  `COL99` text,
-  `COL100` text,
-  `COL101` text,
-  `COL102` text,
-  `COL103` text,
-  `COL104` text,
-  `COL105` text,
-  `COL106` text,
-  `COL107` text,
-  `COL108` text,
-  `COL109` text,
-  `COL110` text,
-  `COL111` text,
-  `COL112` text,
-  `COL113` text,
-  `COL114` text,
-  `COL115` text,
-  `COL116` text,
-  `COL117` text,
-  `COL118` text,
-  `COL119` text,
-  `COL120` text,
-  `COL121` text,
-  `COL122` text,
-  `COL123` text,
-  `COL124` text,
-  `COL125` text,
-  `COL126` text,
-  `COL127` text,
-  `COL128` text,
-  `COL129` text,
-  `COL130` text,
-  `COL131` text,
-  `COL132` text,
-  `COL133` text,
-  `COL134` text,
-  `COL135` text,
-  `COL136` text,
-  `COL137` text,
-  `COL138` text,
-  `COL139` text,
-  `COL140` text,
-  `COL141` text,
-  `COL142` text,
-  `COL143` text,
-  `COL144` text,
-  `COL145` text,
-  `COL146` text,
-  `COL147` text,
-  `COL148` text,
-  `COL149` text,
-  `COL150` text,
-  `COL151` text,
-  `COL152` text,
-  `COL153` text,
-  `COL154` text,
-  `COL155` text,
-  `COL156` text,
-  `COL157` text,
-  `COL158` text,
-  `COL159` text,
-  `COL160` text,
-  `COL161` text,
-  `COL162` text,
-  `COL163` text,
-  `COL164` text,
-  `COL165` text,
-  `COL166` text,
-  `COL167` text,
-  `COL168` text,
-  `COL169` text,
-  `COL170` text,
-  `COL171` text,
-  `COL172` text,
-  `COL173` text,
-  `COL174` text,
-  `COL175` text,
-  `COL176` text,
-  `COL177` text,
-  `COL178` text,
-  `COL179` text,
-  `COL180` text,
-  `COL181` text,
-  `COL182` text,
-  `COL183` text,
-  `COL184` text,
-  `COL185` text,
-  `COL186` text,
-  `COL187` text,
-  `COL188` text,
-  `COL189` text,
-  `COL190` text,
-  `COL191` text,
-  `COL192` text,
-  `COL193` text,
-  `COL194` text,
-  `COL195` text,
-  `COL196` text,
-  `COL197` text
+  `COL1` text DEFAULT NULL,
+  `COL2` text DEFAULT NULL,
+  `COL3` text DEFAULT NULL,
+  `COL4` text DEFAULT NULL,
+  `COL5` text DEFAULT NULL,
+  `COL6` text DEFAULT NULL,
+  `COL7` text DEFAULT NULL,
+  `COL8` text DEFAULT NULL,
+  `COL9` text DEFAULT NULL,
+  `COL10` text DEFAULT NULL,
+  `COL11` text DEFAULT NULL,
+  `COL12` text DEFAULT NULL,
+  `COL13` text DEFAULT NULL,
+  `COL14` text DEFAULT NULL,
+  `COL15` text DEFAULT NULL,
+  `COL16` text DEFAULT NULL,
+  `COL17` text DEFAULT NULL,
+  `COL18` text DEFAULT NULL,
+  `COL19` text DEFAULT NULL,
+  `COL20` text DEFAULT NULL,
+  `COL21` text DEFAULT NULL,
+  `COL22` text DEFAULT NULL,
+  `COL23` text DEFAULT NULL,
+  `COL24` text DEFAULT NULL,
+  `COL25` text DEFAULT NULL,
+  `COL26` text DEFAULT NULL,
+  `COL27` text DEFAULT NULL,
+  `COL28` text DEFAULT NULL,
+  `COL29` text DEFAULT NULL,
+  `COL30` text DEFAULT NULL,
+  `COL31` text DEFAULT NULL,
+  `COL32` text DEFAULT NULL,
+  `COL33` text DEFAULT NULL,
+  `COL34` text DEFAULT NULL,
+  `COL35` text DEFAULT NULL,
+  `COL36` text DEFAULT NULL,
+  `COL37` text DEFAULT NULL,
+  `COL38` text DEFAULT NULL,
+  `COL39` text DEFAULT NULL,
+  `COL40` text DEFAULT NULL,
+  `COL41` text DEFAULT NULL,
+  `COL42` text DEFAULT NULL,
+  `COL43` text DEFAULT NULL,
+  `COL44` text DEFAULT NULL,
+  `COL45` text DEFAULT NULL,
+  `COL46` text DEFAULT NULL,
+  `COL47` text DEFAULT NULL,
+  `COL48` text DEFAULT NULL,
+  `COL49` text DEFAULT NULL,
+  `COL50` text DEFAULT NULL,
+  `COL51` text DEFAULT NULL,
+  `COL52` text DEFAULT NULL,
+  `COL53` text DEFAULT NULL,
+  `COL54` text DEFAULT NULL,
+  `COL55` text DEFAULT NULL,
+  `COL56` text DEFAULT NULL,
+  `COL57` text DEFAULT NULL,
+  `COL58` text DEFAULT NULL,
+  `COL59` text DEFAULT NULL,
+  `COL60` text DEFAULT NULL,
+  `COL61` text DEFAULT NULL,
+  `COL62` text DEFAULT NULL,
+  `COL63` text DEFAULT NULL,
+  `COL64` text DEFAULT NULL,
+  `COL65` text DEFAULT NULL,
+  `COL66` text DEFAULT NULL,
+  `COL67` text DEFAULT NULL,
+  `COL68` text DEFAULT NULL,
+  `COL69` text DEFAULT NULL,
+  `COL70` text DEFAULT NULL,
+  `COL71` text DEFAULT NULL,
+  `COL72` text DEFAULT NULL,
+  `COL73` text DEFAULT NULL,
+  `COL74` text DEFAULT NULL,
+  `COL75` text DEFAULT NULL,
+  `COL76` text DEFAULT NULL,
+  `COL77` text DEFAULT NULL,
+  `COL78` text DEFAULT NULL,
+  `COL79` text DEFAULT NULL,
+  `COL80` text DEFAULT NULL,
+  `COL81` text DEFAULT NULL,
+  `COL82` text DEFAULT NULL,
+  `COL83` text DEFAULT NULL,
+  `COL84` text DEFAULT NULL,
+  `COL85` text DEFAULT NULL,
+  `COL86` text DEFAULT NULL,
+  `COL87` text DEFAULT NULL,
+  `COL88` text DEFAULT NULL,
+  `COL89` text DEFAULT NULL,
+  `COL90` text DEFAULT NULL,
+  `COL91` text DEFAULT NULL,
+  `COL92` text DEFAULT NULL,
+  `COL93` text DEFAULT NULL,
+  `COL94` text DEFAULT NULL,
+  `COL95` text DEFAULT NULL,
+  `COL96` text DEFAULT NULL,
+  `COL97` text DEFAULT NULL,
+  `COL98` text DEFAULT NULL,
+  `COL99` text DEFAULT NULL,
+  `COL100` text DEFAULT NULL,
+  `COL101` text DEFAULT NULL,
+  `COL102` text DEFAULT NULL,
+  `COL103` text DEFAULT NULL,
+  `COL104` text DEFAULT NULL,
+  `COL105` text DEFAULT NULL,
+  `COL106` text DEFAULT NULL,
+  `COL107` text DEFAULT NULL,
+  `COL108` text DEFAULT NULL,
+  `COL109` text DEFAULT NULL,
+  `COL110` text DEFAULT NULL,
+  `COL111` text DEFAULT NULL,
+  `COL112` text DEFAULT NULL,
+  `COL113` text DEFAULT NULL,
+  `COL114` text DEFAULT NULL,
+  `COL115` text DEFAULT NULL,
+  `COL116` text DEFAULT NULL,
+  `COL117` text DEFAULT NULL,
+  `COL118` text DEFAULT NULL,
+  `COL119` text DEFAULT NULL,
+  `COL120` text DEFAULT NULL,
+  `COL121` text DEFAULT NULL,
+  `COL122` text DEFAULT NULL,
+  `COL123` text DEFAULT NULL,
+  `COL124` text DEFAULT NULL,
+  `COL125` text DEFAULT NULL,
+  `COL126` text DEFAULT NULL,
+  `COL127` text DEFAULT NULL,
+  `COL128` text DEFAULT NULL,
+  `COL129` text DEFAULT NULL,
+  `COL130` text DEFAULT NULL,
+  `COL131` text DEFAULT NULL,
+  `COL132` text DEFAULT NULL,
+  `COL133` text DEFAULT NULL,
+  `COL134` text DEFAULT NULL,
+  `COL135` text DEFAULT NULL,
+  `COL136` text DEFAULT NULL,
+  `COL137` text DEFAULT NULL,
+  `COL138` text DEFAULT NULL,
+  `COL139` text DEFAULT NULL,
+  `COL140` text DEFAULT NULL,
+  `COL141` text DEFAULT NULL,
+  `COL142` text DEFAULT NULL,
+  `COL143` text DEFAULT NULL,
+  `COL144` text DEFAULT NULL,
+  `COL145` text DEFAULT NULL,
+  `COL146` text DEFAULT NULL,
+  `COL147` text DEFAULT NULL,
+  `COL148` text DEFAULT NULL,
+  `COL149` text DEFAULT NULL,
+  `COL150` text DEFAULT NULL,
+  `COL151` text DEFAULT NULL,
+  `COL152` text DEFAULT NULL,
+  `COL153` text DEFAULT NULL,
+  `COL154` text DEFAULT NULL,
+  `COL155` text DEFAULT NULL,
+  `COL156` text DEFAULT NULL,
+  `COL157` text DEFAULT NULL,
+  `COL158` text DEFAULT NULL,
+  `COL159` text DEFAULT NULL,
+  `COL160` text DEFAULT NULL,
+  `COL161` text DEFAULT NULL,
+  `COL162` text DEFAULT NULL,
+  `COL163` text DEFAULT NULL,
+  `COL164` text DEFAULT NULL,
+  `COL165` text DEFAULT NULL,
+  `COL166` text DEFAULT NULL,
+  `COL167` text DEFAULT NULL,
+  `COL168` text DEFAULT NULL,
+  `COL169` text DEFAULT NULL,
+  `COL170` text DEFAULT NULL,
+  `COL171` text DEFAULT NULL,
+  `COL172` text DEFAULT NULL,
+  `COL173` text DEFAULT NULL,
+  `COL174` text DEFAULT NULL,
+  `COL175` text DEFAULT NULL,
+  `COL176` text DEFAULT NULL,
+  `COL177` text DEFAULT NULL,
+  `COL178` text DEFAULT NULL,
+  `COL179` text DEFAULT NULL,
+  `COL180` text DEFAULT NULL,
+  `COL181` text DEFAULT NULL,
+  `COL182` text DEFAULT NULL,
+  `COL183` text DEFAULT NULL,
+  `COL184` text DEFAULT NULL,
+  `COL185` text DEFAULT NULL,
+  `COL186` text DEFAULT NULL,
+  `COL187` text DEFAULT NULL,
+  `COL188` text DEFAULT NULL,
+  `COL189` text DEFAULT NULL,
+  `COL190` text DEFAULT NULL,
+  `COL191` text DEFAULT NULL,
+  `COL192` text DEFAULT NULL,
+  `COL193` text DEFAULT NULL,
+  `COL194` text DEFAULT NULL,
+  `COL195` text DEFAULT NULL,
+  `COL196` text DEFAULT NULL,
+  `COL197` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 update t2 set col150=@a;
 update t2 set col145=@b;