innodb_zip merged with 10.2 and 5.7, did not add innochecksum tests

mysql-test/include/expect_crash.inc

+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+
+# There should be a debug crash after using this .inc file
+--exec echo "wait" > $_expect_file_name

mysql-test/suite/innodb/include/show_i_s_tables.inc

@@ -8,8 +8,7 @@ SELECT t.name 'Table Name',
 	t.flag 'Table Flags',
 	t.n_cols 'Columns',
 	t.row_format 'Row Format',
-	t.zip_page_size 'Zip Size',
-	t.space_type 'Space Type'
+	t.zip_page_size 'Zip Size'
 	FROM information_schema.innodb_sys_tables t LEFT JOIN
 	     information_schema.innodb_sys_tablespaces s
 	ON t.space = s.space

mysql-test/suite/innodb_zip/include/innodb_wl6501_crash_temp.inc

+#
+# WL#6501: make truncate table atomic
+#
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/big_test.inc
+
+# Valgrind would complain about memory leaks when we crash on purpose.
+--source include/not_valgrind.inc
+# Embedded server does not support crashing
+--source include/not_embedded.inc
+# Avoid CrashReporter popup on Mac
+--source include/not_crashrep.inc
+
+# suppress expected warnings
+call mtr.add_suppression("does not exist in the InnoDB internal");
+
+################################################################################
+#
+# Will test following scenarios:
+# 1. Hit crash point on completing drop of all indexes before creation of index
+#    is commenced.
+# 2. Hit crash point after data is updated to system-table and in-memory dict.
+#
+################################################################################
+
+#-----------------------------------------------------------------------------
+#
+# create test-bed
+#
+let $per_table = `select @@innodb_file_per_table`;
+
+eval set global innodb_file_per_table = on;
+let $WL6501_TMP_DIR = `select @@tmpdir`;
+let $WL6501_DATA_DIR = `select @@datadir`;
+let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
+
+#-----------------------------------------------------------------------------
+#
+# 1. Hit crash point on completing drop of all indexes before creation of index
+#    is commenced.
+#
+--echo "1. Hit crash point on completing drop of all indexes before creation"
+--echo "   of index is commenced."
+eval set global innodb_file_per_table = $wl6501_file_per_table;
+set innodb_strict_mode=off;
+--disable_warnings
+eval create $wl6501_temp table t (
+	i int, f float, c char,
+	primary key pk(i), unique findex(f), index ck(c))
+	engine = innodb row_format = $wl6501_row_fmt
+	key_block_size = $wl6501_kbs;
+--enable_warnings
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+select * from t;
+check table t;
+#
+set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
+--source include/expect_crash.inc
+--error 2013
+truncate table t;
+#
+--source include/start_mysqld.inc
+check table t;
+
+#-----------------------------------------------------------------------------
+#
+# 2. Hit crash point after data is updated to system-table and in-memory dict.
+#
+--echo "2. Hit crash point after data is updated to system-table and"
+--echo "   in-memory dict."
+eval set global innodb_file_per_table = $wl6501_file_per_table;
+set innodb_strict_mode=off;
+--disable_warnings
+eval create $wl6501_temp table t (
+	i int, f float, c char,
+	primary key pk(i), unique findex(f), index ck(c))
+	engine = innodb row_format = $wl6501_row_fmt
+	key_block_size = $wl6501_kbs;
+--enable_warnings
+insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
+select * from t;
+check table t;
+#
+set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
+--source include/expect_crash.inc
+--error 2013
+truncate table t;
+#
+--source include/start_mysqld.inc
+check table t;
+
+#-----------------------------------------------------------------------------
+#
+# remove test-bed
+#
+eval set global innodb_file_per_table = $per_table;

mysql-test/suite/innodb_zip/r/4k.result

 SET default_storage_engine=InnoDB;
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # Test 1) Show the page size from Information Schema
 SELECT variable_value FROM information_schema.global_status
 WHERE LOWER(variable_name) = 'innodb_page_size';
 variable_value
 4096
 # Test 2) The number of buffer pool pages is dependent upon the page size.
-SELECT variable_value FROM information_schema.global_status
+SELECT variable_value in (2047, 2048) FROM information_schema.global_status
 WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
-variable_value
-2048
+variable_value in (2047, 2048)
+1
 # Test 3) Query some information_shema tables that are dependent upon
 #         the page size.
 SELECT	t.name table_name, t.n_cols, t.flag table_flags,
@@ -41,6 +39,12 @@ test/t1	5	0	PRIMARY	3	3	1
 test/t2	5	1	PRIMARY	3	3	1
 test/t3	5	37	PRIMARY	3	3	1
 test/t4	5	33	PRIMARY	3	3	1
+=== information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
+Space_Name	Page_Size	Zip_Size	Formats_Permitted	Path
+test/t1	DEFAULT	0	Compact or Redundant	MYSQLD_DATADIR/test/t1.ibd
+test/t2	DEFAULT	0	Compact or Redundant	MYSQLD_DATADIR/test/t2.ibd
+test/t3	DEFAULT	2048	Compressed	MYSQLD_DATADIR/test/t3.ibd
+test/t4	DEFAULT	0	Dynamic	MYSQLD_DATADIR/test/t4.ibd
 DROP TABLE t1, t2, t3, t4;
 # Test 4) The maximum row size is dependent upon the page size.
 #         Redundant: 1979, Compact: 1982.
@@ -408,4 +412,4 @@ CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
 DROP TABLE t1;
-SET GLOBAL innodb_file_format = `Antelope`;
+SET GLOBAL innodb_file_format=Antelope;

mysql-test/suite/innodb_zip/r/innodb_bug36169.result

-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=ON;

mysql-test/suite/innodb_zip/r/innodb_bug36172.result

-SET storage_engine=InnoDB;

mysql-test/suite/innodb_zip/r/innodb_bug52745.result

-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-CREATE TABLE bug52745 (
-a2 int(10) unsigned DEFAULT NULL,
-col37 time DEFAULT NULL,
-col38 char(229) CHARACTER SET utf8 DEFAULT NULL,
-col39 text,
-col40 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-col41 int(10) unsigned DEFAULT NULL,
-col42 varchar(248) CHARACTER SET utf8 DEFAULT NULL,
-col43 smallint(5) unsigned zerofill DEFAULT NULL,
-col44 varchar(150) CHARACTER SET utf8 DEFAULT NULL,
-col45 float unsigned zerofill DEFAULT NULL,
-col46 binary(1) DEFAULT NULL,
-col47 tinyint(4) DEFAULT NULL,
-col48 tinyint(1) DEFAULT NULL,
-col49 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col50 binary(1) DEFAULT NULL,
-col51 double unsigned zerofill DEFAULT NULL,
-col52 int(10) unsigned DEFAULT NULL,
-col53 time DEFAULT NULL,
-col54 double unsigned DEFAULT NULL,
-col55 time DEFAULT NULL,
-col56 mediumtext CHARACTER SET latin2,
-col57 blob,
-col58 decimal(52,16) unsigned zerofill NOT NULL DEFAULT '000000000000000000000000000000000000.0000000000000000',
-col59 binary(1) DEFAULT NULL,
-col60 longblob,
-col61 time DEFAULT NULL,
-col62 longtext CHARACTER SET utf8 COLLATE utf8_persian_ci,
-col63 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col64 int(10) unsigned DEFAULT NULL,
-col65 date DEFAULT NULL,
-col66 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col67 binary(1) DEFAULT NULL,
-col68 tinyblob,
-col69 date DEFAULT NULL,
-col70 tinyint(3) unsigned zerofill DEFAULT NULL,
-col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
-col72 datetime DEFAULT NULL,
-col73 smallint(5) unsigned zerofill DEFAULT NULL,
-col74 longblob,
-col75 bit(34) DEFAULT NULL,
-col76 float unsigned zerofill DEFAULT NULL,
-col77 year(2) DEFAULT NULL,
-col78 tinyint(3) unsigned DEFAULT NULL,
-col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
-col80 datetime DEFAULT NULL,
-col81 smallint(6) DEFAULT NULL,
-col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
-col83 bigint(20) unsigned zerofill DEFAULT NULL,
-col84 float unsigned zerofill DEFAULT NULL,
-col85 double DEFAULT NULL,
-col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
-col87 varbinary(221) DEFAULT NULL,
-col88 double unsigned DEFAULT NULL,
-col89 float unsigned zerofill DEFAULT NULL,
-col90 tinyblob
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-Warnings:
-Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
-Note	1291	Column 'col82' has duplicated value '' in ENUM
-Note	1291	Column 'col82' has duplicated value '' in ENUM
-INSERT INTO bug52745 SET
-col40='0000-00-00 00:00:00',
-col51=16547,
-col53='7711484',
-col54=-28604,
-col55='7112612',
-col56='wakefulness\'',
-col57=repeat('absorbefacient\'',106),
-col58=11027,
-col59='AM09gW7',
-col60=repeat('Noelani\'',16),
-col61='2520576',
-col62='substitutiv',
-col63='19950106155112',
-col64=-12038,
-col65='86238806',
-col66='19600719080256',
-col68=repeat('Sagittarius\'',54),
-col69='38943902',
-col70=1232,
-col71='Elora\'',
-col74=repeat('zipp',11),
-col75='0',
-col76=23254,
-col78=13247,
-col79='56219',
-col80='20500609035724',
-col81=11632,
-col82=7,
-col84=-23863,
-col85=6341,
-col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
-col88=16894,
-col89=6161,
-col90=repeat('gale',48);
-Warnings:
-Warning	1265	Data truncated for column 'col53' at row 1
-Warning	1264	Out of range value for column 'col54' at row 1
-Warning	1265	Data truncated for column 'col59' at row 1
-Warning	1265	Data truncated for column 'col61' at row 1
-Warning	1264	Out of range value for column 'col64' at row 1
-Warning	1265	Data truncated for column 'col65' at row 1
-Warning	1264	Out of range value for column 'col66' at row 1
-Warning	1265	Data truncated for column 'col68' at row 1
-Warning	1265	Data truncated for column 'col69' at row 1
-Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1265	Data truncated for column 'col53' at row 1
-Warning	1264	Out of range value for column 'col54' at row 1
-Warning	1265	Data truncated for column 'col59' at row 1
-Warning	1265	Data truncated for column 'col61' at row 1
-Warning	1264	Out of range value for column 'col64' at row 1
-Warning	1265	Data truncated for column 'col65' at row 1
-Warning	1264	Out of range value for column 'col66' at row 1
-Warning	1265	Data truncated for column 'col68' at row 1
-Warning	1265	Data truncated for column 'col69' at row 1
-Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
-DROP TABLE bug52745;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=1;

mysql-test/suite/innodb_zip/r/innodb_bug53591.result

-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-set old_alter_table=0;
-CREATE TABLE bug53591(a text charset utf8 not null)
-ENGINE=InnoDB KEY_BLOCK_SIZE=1;
-ALTER TABLE bug53591 ADD PRIMARY KEY(a(220));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is {checked_valid}. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-SHOW WARNINGS;
-Level	Code	Message
-Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is {checked_valid}. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-DROP TABLE bug53591;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=1;

mysql-test/suite/innodb_zip/r/innodb_bug56680.result

-SET GLOBAL tx_isolation='REPEATABLE-READ';
-SET GLOBAL innodb_file_format=Barracuda;
-SET GLOBAL innodb_file_per_table=on;
-CREATE TABLE bug56680(
-a INT AUTO_INCREMENT PRIMARY KEY,
-b CHAR(1),
-c INT,
-INDEX(b))
-ENGINE=InnoDB;
-INSERT INTO bug56680 VALUES(0,'x',1);
-BEGIN;
-SELECT b FROM bug56680;
-b
-x
-BEGIN;
-UPDATE bug56680 SET b='X';
-SELECT b FROM bug56680;
-b
-x
-SELECT * FROM bug56680;
-a	b	c
-1	x	1
-ROLLBACK;
-SELECT b FROM bug56680;
-b
-x
-SET GLOBAL tx_isolation='READ-UNCOMMITTED';
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-BEGIN;
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-BEGIN;
-DELETE FROM bug56680 WHERE a=1;
-INSERT INTO bug56680 VALUES(1,'X',1);
-SELECT b FROM bug56680 LIMIT 3;
-b
-X
-x
-x
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CHECK TABLE bug56680;
-Table	Op	Msg_type	Msg_text
-test.bug56680	check	status	OK
-ROLLBACK;
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CHECK TABLE bug56680;
-Table	Op	Msg_type	Msg_text
-test.bug56680	check	status	OK
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CREATE TABLE bug56680_2(
-a INT AUTO_INCREMENT PRIMARY KEY,
-b VARCHAR(2) CHARSET latin1 COLLATE latin1_german2_ci,
-c INT,
-INDEX(b))
-ENGINE=InnoDB;
-INSERT INTO bug56680_2 SELECT 0,_latin1 0xdf,c FROM bug56680;
-BEGIN;
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-HEX(b)
-DF
-DF
-DELETE FROM bug56680_2 WHERE a=1;
-INSERT INTO bug56680_2 VALUES(1,'SS',1);
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-HEX(b)
-5353
-DF
-DF
-CHECK TABLE bug56680_2;
-Table	Op	Msg_type	Msg_text
-test.bug56680_2	check	status	OK
-ALTER TABLE bug56680_2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-HEX(b)
-5353
-DF
-DELETE FROM bug56680_2 WHERE a=1;
-INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1);
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-HEX(b)
-DF
-DF
-DF
-CHECK TABLE bug56680_2;
-Table	Op	Msg_type	Msg_text
-test.bug56680_2	check	status	OK
-DROP TABLE bug56680_2;
-DROP TABLE bug56680;

mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result

-set global innodb_file_per_table=on;
-set global innodb_file_format=`1`;
-create table t1(a text) engine=innodb key_block_size=8;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-8192
-drop table t1;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-8192
-create table t2(a text) engine=innodb;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-drop table t2;

mysql-test/suite/innodb_zip/r/innodb_cmp_per_index.result

-SET GLOBAL innodb_cmp_per_index_enabled=ON;
-SET GLOBAL innodb_file_format=Barracuda;
-SELECT * FROM information_schema.innodb_cmp_per_index;
-CREATE TABLE t (
-a INT,
-b VARCHAR(512),
-c VARCHAR(16),
-PRIMARY KEY (a),
-INDEX (b(512)),
-INDEX (c(16))
-) ENGINE=INNODB KEY_BLOCK_SIZE=2;
-SELECT
-database_name,
-table_name,
-index_name,
-compress_ops,
-compress_ops_ok,
-uncompress_ops
-FROM information_schema.innodb_cmp_per_index
-ORDER BY 1, 2, 3;
-database_name	test
-table_name	t
-index_name	b
-compress_ops	1
-compress_ops_ok	1
-uncompress_ops	0
-database_name	test
-table_name	t
-index_name	c
-compress_ops	1
-compress_ops_ok	1
-uncompress_ops	0
-database_name	test
-table_name	t
-index_name	PRIMARY
-compress_ops	1
-compress_ops_ok	1
-uncompress_ops	0
-BEGIN;
-COMMIT;
-ALTER TABLE t DROP INDEX c;
-GRANT USAGE ON *.* TO 'tuser01'@'localhost' IDENTIFIED BY 'cDJvI9s_Uq';
-FLUSH PRIVILEGES;
-SELECT * FROM information_schema.innodb_cmp_per_index;
-ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
-DROP USER 'tuser01'@'localhost';
-SELECT
-database_name,
-table_name,
-index_name,
-CASE WHEN compress_ops=47 and @@innodb_compression_level IN (4,8,9) THEN 65
-ELSE compress_ops END as compress_ops,
-CASE WHEN compress_ops_ok=47 and @@innodb_compression_level IN (4,8,9) THEN 65
-ELSE compress_ops_ok END as compress_ops_ok,
-uncompress_ops
-FROM information_schema.innodb_cmp_per_index
-ORDER BY 1, 2, 3;
-database_name	test
-table_name	t
-index_name	b
-compress_ops	43
-compress_ops_ok	43
-uncompress_ops	0
-database_name	test
-table_name	t
-index_name	PRIMARY
-compress_ops	65
-compress_ops_ok	65
-uncompress_ops	0
-database_name	unknown
-table_name	unknown
-index_name	index_id:idisnondeterministic
-compress_ops	1
-compress_ops_ok	1
-uncompress_ops	0
-SET GLOBAL innodb_cmp_per_index_enabled=ON;
-SELECT COUNT(*) FROM t;
-COUNT(*)	128
-SELECT
-database_name,
-table_name,
-index_name,
-compress_ops,
-compress_ops_ok,
-uncompress_ops
-FROM information_schema.innodb_cmp_per_index
-ORDER BY 1, 2, 3;
-database_name	test
-table_name	t
-index_name	b
-compress_ops	0
-compress_ops_ok	0
-uncompress_ops	6
-database_name	test
-table_name	t
-index_name	PRIMARY
-compress_ops	0
-compress_ops_ok	0
-uncompress_ops	5
-DROP TABLE t;
-SET GLOBAL innodb_cmp_per_index_enabled=default;
-SET GLOBAL innodb_file_format=default;

mysql-test/suite/innodb_zip/r/recover.result

+Warnings:
+Note	1051	Unknown table 'test.a'
 #
 # MDEV-12720 recovery fails with "Generic error"
 # for ROW_FORMAT=compressed
@@ -15,3 +17,4 @@ SELECT COUNT(*) from a;
 COUNT(*)
 1010
 DROP TABLE a;
+SET GLOBAL innodb_file_format=Antelope;

mysql-test/suite/innodb_zip/t/innodb-restart.opt

---innodb_sys_tablespaces 
---innodb_sys_datafiles
\ No newline at end of file

mysql-test/suite/innodb_zip/t/innodb_cmp_per_index.opt

---innodb_page_size=16384 
---innodb_cmp_per_index_reset
\ No newline at end of file

mysql-test/suite/innodb_zip/t/recover.test

@@ -7,6 +7,9 @@
 # that are not created with ENGINE=InnoDB.
 # Flush any non-InnoDB tables to prevent that from happening.
 FLUSH TABLES;
+let $innodb_file_format_orig=`select @@innodb_file_format`;
+SET GLOBAL innodb_file_format=Barracuda;
+drop table if exists a;
 --enable_query_log
 
 --echo #
@@ -29,3 +32,5 @@ COMMIT;
 
 SELECT COUNT(*) from a;
 DROP TABLE a;
+eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
+

mysql-test/suite/innodb_zip/t/restart.test

@@ -34,9 +34,11 @@ let $MYSQL_DATA_DIR= `select @@datadir`;
 let $data_directory = DATA DIRECTORY='$MYSQL_TMP_DIR/alt_dir';
 
 let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
+let $innodb_file_format_orig=`select @@innodb_file_format`;
 --enable_query_log
 
 set global innodb_file_per_table=on;
+set global innodb_file_format='Barracuda';
 
 --echo #
 --echo # Create and insert records into a REDUNDANT row formatted table.
@@ -563,6 +565,7 @@ DROP TABLE t77_restart;
 --rmdir $MYSQL_TMP_DIR/new_dir
 
 -- disable_query_log
+eval set global innodb_file_format=$innodb_file_format_orig;
 eval set global innodb_file_per_table=$innodb_file_per_table_orig;
 -- enable_query_log
 

mysql-test/suite/innodb_zip/t/wl6501_crash_3.test

@@ -16,9 +16,11 @@
 --source include/not_embedded.inc
 # Avoid CrashReporter popup on Mac
 --source include/not_crashrep.inc
-
+let $innodb_file_format_orig=`select @@innodb_file_format`;
+SET GLOBAL innodb_file_format=Barracuda;
 let $wl6501_file_per_table = 1;
 let $wl6501_row_fmt = compressed;
 let $wl6501_kbs = 16;
---source suite/innodb/include/innodb_wl6501_crash.inc
+--source include/innodb_wl6501_crash.inc
+eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;