MDEV-12762 Some files in current 10.2 tree seem to be reverted to an old state

The issue was a bad merge of MDEV-12253 from 10.1 to 10.2
in commit f9cc3918.
In that merge, I wrongly assumed that all test file conflicts
for mysql-test/suite/encryption had been properly resolved in
bb-10.2-MDEV-12253 (commit 76aa6be77635c7017459ce33b41c837c9acb606d)
while in fact, some files there had been copied from the 10.1 branch.

This commit is based on a manually done conflict resolution of
the mysql-test/suite/encryption on the same merge, applied to
the current 10.2 branch.

As part of this commit, the test encryption.innodb-bad-key-change4
which was shortly disabled due to MDEV-11336 will be re-enabled again.
(While the test enables innodb_defragment, it does not fail even though
enabling innodb_defragment currently has no effect.)

mysql-test/suite/encryption/disabled.def

@@ -13,4 +13,3 @@
 innodb_scrub            : MDEV-8139 scrubbing does not work reliably
 innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
 innodb_encryption-page-compression : MDEV-11420
-innodb-bad-key-change4 : MDEV-11336 Fix and enable innodb_defragment

mysql-test/suite/encryption/r/filekeys_emptyfile.result

 call mtr.add_suppression("System key id 1 is missing at");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /System key id 1 is missing at/ in mysqld.1.err
+FOUND 1 /System key id 1 is missing at/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_encfile_bad.result

 call mtr.add_suppression("Cannot decrypt .*filekeys-data.enc. Wrong key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
+FOUND 1 /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_encfile_badfile.result

 call mtr.add_suppression("File 'bad' not found");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /File 'bad' not found/ in mysqld.1.err
+FOUND 1 /File 'bad' not found/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_encfile_no.result

 call mtr.add_suppression("Cannot decrypt .*filekeys-data.enc. Wrong key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
+FOUND 1 /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_nofile.result

 call mtr.add_suppression("file-key-management-filename is not set");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /file-key-management-filename is not set/ in mysqld.1.err
+FOUND 1 /file-key-management-filename is not set/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_syntax.result

 call mtr.add_suppression("File '.*keys.txt' not found");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /File '.*keys.txt' not found/ in mysqld.1.err
+FOUND 1 /File '.*keys.txt' not found/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -12,7 +12,7 @@ ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 2
 call mtr.add_suppression("File '.*keys.txt' not found");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /File '.*keys.txt' not found/ in mysqld.1.err
+FOUND 1 /File '.*keys.txt' not found/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -21,7 +21,7 @@ plugin_status
 call mtr.add_suppression("Invalid key id");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key id/ in mysqld.1.err
+FOUND 1 /Invalid key id/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -32,7 +32,7 @@ ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 10
 call mtr.add_suppression("Invalid key id");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key id/ in mysqld.1.err
+FOUND 2 /Invalid key id/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -41,7 +41,7 @@ plugin_status
 call mtr.add_suppression("Invalid key id");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key id/ in mysqld.1.err
+FOUND 2 /Invalid key id/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -52,7 +52,7 @@ ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 47
 call mtr.add_suppression("Invalid key id");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key id/ in mysqld.1.err
+FOUND 2 /Invalid key id/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -61,7 +61,7 @@ plugin_status
 call mtr.add_suppression("Invalid key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key/ in mysqld.1.err
+FOUND 3 /Invalid key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -72,7 +72,7 @@ ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 33
 call mtr.add_suppression("Invalid key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key/ in mysqld.1.err
+FOUND 4 /Invalid key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -81,7 +81,7 @@ plugin_status
 call mtr.add_suppression("Invalid key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key/ in mysqld.1.err
+FOUND 4 /Invalid key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -92,7 +92,7 @@ ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 2
 call mtr.add_suppression("Invalid key");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Invalid key/ in mysqld.1.err
+FOUND 4 /Invalid key/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -101,7 +101,7 @@ plugin_status
 call mtr.add_suppression("Syntax error");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Syntax error/ in mysqld.1.err
+FOUND 1 /Syntax error/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -112,7 +112,7 @@ ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 1
 call mtr.add_suppression("Syntax error");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Syntax error/ in mysqld.1.err
+FOUND 2 /Syntax error/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -121,7 +121,7 @@ plugin_status
 call mtr.add_suppression("Syntax error");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Syntax error/ in mysqld.1.err
+FOUND 2 /Syntax error/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -132,7 +132,7 @@ ERROR HY000: System key id 1 is missing at MYSQL_TMP_DIR/keys.txt line 1, column
 call mtr.add_suppression("Syntax error");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Syntax error/ in mysqld.1.err
+FOUND 2 /Syntax error/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins
@@ -141,7 +141,7 @@ plugin_status
 call mtr.add_suppression("System key id 1");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /System key id 1/ in mysqld.1.err
+FOUND 1 /System key id 1/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_tooshort.result

 call mtr.add_suppression("Cannot decrypt .*tooshort.enc. Not encrypted");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Cannot decrypt .*tooshort.enc. Not encrypted/ in mysqld.1.err
+FOUND 1 /Cannot decrypt .*tooshort.enc. Not encrypted/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/filekeys_unencfile.result

 call mtr.add_suppression("Cannot decrypt .*keys.txt. Not encrypted");
 call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND /Cannot decrypt .*keys.txt. Not encrypted/ in mysqld.1.err
+FOUND 1 /Cannot decrypt .*keys.txt. Not encrypted/ in mysqld.1.err
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
 ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 select plugin_status from information_schema.plugins

mysql-test/suite/encryption/r/innochecksum.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
 # Create and populate a tables
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
@@ -23,5 +19,3 @@ CREATE TABLE t5 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB PAGE_CO
 # Write file to make mysql-test-run.pl start up the server again
 # Cleanup
 DROP TABLE t1, t2, t3, t4, t5;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb-bad-key-change.result

-call mtr.add_suppression("Plugin 'file_key_management'");
+call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
+call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
 call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\.");
 call mtr.add_suppression("File '.*mysql-test.std_data.keysbad3\\.txt' not found");
 # Start server with keys2.txt

mysql-test/suite/encryption/r/innodb-bad-key-change2.result

 call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t1(new)?\\.ibd' cannot be decrypted\\.");
 call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
-call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded.");
+call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded\\.");
 SET GLOBAL innodb_file_per_table = ON;
-CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
+CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB
+ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
 SELECT * FROM t1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
@@ -11,7 +12,7 @@ Level	Code	Message
 Warning	192	Table test/t1 in tablespace  is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
 Warning	192	Table t1 in file ./test/t1.ibd is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
 Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
-ALTER TABLE t1 engine=InnoDB;
+ALTER TABLE t1 ENGINE=InnoDB;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 SHOW WARNINGS;
 Level	Code	Message
@@ -53,5 +54,3 @@ RENAME TABLE t1 TO t1new;
 ALTER TABLE t1new RENAME TO t2new;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DROP TABLE t1new;
-DROP TABLE t1, t1new;
-ERROR 42S02: Unknown table 'test.t1,test.t1new'

mysql-test/suite/encryption/r/innodb-bad-key-change3.result

-call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded.");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
+call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
+call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");
 set global innodb_compression_algorithm = 1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1 ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 SHOW WARNINGS;
@@ -14,12 +13,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 `PAGE_COMPRESSED`=1 `ENCRYPTED`=YES `ENCRYPTION_KEY_ID`=4
 INSERT INTO t1 VALUES (1,'foobar'),(2,'barfoo');
 FLUSH TABLE t1 FOR EXPORT;
+# List before copying files
+t1.cfg
+t1.frm
+t1.ibd
 backup: t1
 UNLOCK TABLES;
 ALTER TABLE t1 DISCARD TABLESPACE;
 restore: t1 .ibd and .cfg files
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 ALTER TABLE t1 IMPORT TABLESPACE;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 SHOW CREATE TABLE t1;

mysql-test/suite/encryption/r/innodb-bad-key-change4.result

 call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t1\\.ibd' cannot be decrypted\\.");
 call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
 SET GLOBAL innodb_file_per_table = ON;
-CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
+CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB
+ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text

mysql-test/suite/encryption/r/innodb-discard-import-change.result

 call mtr.add_suppression("InnoDB: Table .* tablespace is set as discarded");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_compression_algorithm = 1;
 create table t1(c1 bigint not null primary key auto_increment, b char(200))  engine=innodb encrypted=yes encryption_key_id=4;
 create table t2(c1 bigint not null primary key auto_increment, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;

mysql-test/suite/encryption/r/innodb-discard-import.result

 call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
 call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_compression_algorithm = 1;
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=4;
 show warnings;

mysql-test/suite/encryption/r/innodb-encryption-alter.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encrypt_tables = ON;
 SET GLOBAL innodb_encryption_threads = 4;
 CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=NO ENCRYPTION_KEY_ID=4;
@@ -53,5 +49,3 @@ Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create
 Warning	1030	Got error 140 "Wrong create options" from storage engine InnoDB
 set innodb_default_encryption_key_id = 1;
 drop table t1,t2;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb-log-encrypt-crash.result

-call mtr.add_suppression("InnoDB: New log files created, LSN=.*");
-call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables.");
-call mtr.add_suppression("InnoDB: Error: Table .*");
-CREATE TABLE t1 (
-pk bigint auto_increment,
-col_int int,
-col_int_key int,
-col_char char(12),
-col_char_key char(12),
-primary key (pk),
-key (`col_int_key` ),
-key (`col_char_key` )
-) ENGINE=InnoDB;
-CREATE TABLE t2 LIKE t1;
-INSERT INTO t1 VALUES (NULL,1,1,'foo','foo'),(NULL,2,2,'bar','bar'),(NULL,3,3,'baz','baz'),(NULL,4,4,'qux','qux');
-INSERT INTO t2 
-SELECT NULL, a1.col_int, a1.col_int_key, a1.col_char, a1.col_char_key 
-FROM t1 a1, t1 a2, t1 a3, t1 a4, t1 a5, t1 a6, t1 a7, t1 a8, t1 a9, t1 a10;
-DROP TABLE t1, t2;

mysql-test/suite/encryption/r/innodb-log-encrypt.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
-create table t1(c1 bigint not null, b char(200), c varchar(200)) engine=innodb encrypted=yes encryption_key_id=1;
-show warnings;
-Level	Code	Message
-create procedure innodb_insert_proc (repeat_count int)
-begin
-declare current_num int;
-set current_num = 0;
-while current_num < repeat_count do
-insert into t1 values(current_num, substring(MD5(RAND()), -64), REPEAT('privatejanprivate',10));
-set current_num = current_num + 1;
-end while;
-end//
-commit;
-begin;
-call innodb_insert_proc(2000);
-commit;
-update t1 set c1 = c1 +1;
-select count(*) from t1;
-count(*)
-2000
-# Kill the server
-# ibdata1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ibdata1
-# t1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in t1.ibd
-# log0 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ib_logfile0
-# log1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ib_logfile1
-# Restart mysqld --innodb_encrypt_log=0
-insert into t1 values(5000, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5001, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5002, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5003, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5004, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-# ibdata1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ibdata1
-# t1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in t1.ibd
-# log0 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ib_logfile0
-# log1 yes on expecting NOT FOUND
-NOT FOUND /privatejanprivate/ in ib_logfile1
-# ibdata1 yes on expecting NOT FOUND
-NOT FOUND /publicmessage/ in ibdata1
-# t1 yes on expecting NOT FOUND
-NOT FOUND /publicmessage/ in t1.ibd
-# log0 no on expecting FOUND/NOTFOUND depending where insert goes
-FOUND 48 /publicmessage/ in ib_logfile0
-# log1 no on expecting FOUND/NOTFOUND depending where insert goes
-NOT FOUND /publicmessage/ in ib_logfile1
-drop procedure innodb_insert_proc;
-drop table t1;

mysql-test/suite/encryption/r/innodb-page_encryption-32k.result

-call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
 create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
+ERROR HY000: Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
+show warnings;
+Level	Code	Message
+Warning	140	InnoDB: ENCRYPTION_KEY_ID 3 not available
+Error	1005	Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
+Warning	1030	Got error 140 "Wrong create options" from storage engine InnoDB
+create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
 create table innodb_redundant(c1 bigint not null, b char(200))  engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
 show create table innodb_compact;
 Table	Create Table
@@ -16,7 +20,7 @@ Table	Create Table
 innodb_dynamic	CREATE TABLE `innodb_dynamic` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=3
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=33
 show create table innodb_redundant;
 Table	Create Table
 innodb_redundant	CREATE TABLE `innodb_redundant` (
@@ -72,9 +76,6 @@ innodb_compact	CREATE TABLE `innodb_compact` (
   `b` char(200) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
 alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
-Warnings:
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
 show create table innodb_dynamic;
 Table	Create Table
 innodb_dynamic	CREATE TABLE `innodb_dynamic` (

mysql-test/suite/encryption/r/innodb-page_encryption.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 Level	Code	Message
@@ -122,10 +118,6 @@ variable_value >= 0
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
 variable_value >= 0
 1
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 update innodb_normal set c1 = c1 +1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_compressed set c1 = c1 + 1;
@@ -201,10 +193,6 @@ innodb_redundant	CREATE TABLE `innodb_redundant` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 show create table innodb_compact;
 Table	Create Table
 innodb_compact	CREATE TABLE `innodb_compact` (
@@ -281,5 +269,3 @@ drop table innodb_compressed;
 drop table innodb_dynamic;
 drop table innodb_redundant;
 drop table innodb_defkey;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb-page_encryption_compression.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
 show warnings;
@@ -43,8 +41,6 @@ call innodb_insert_proc(2000);
 insert into innodb_compact select * from innodb_normal;
 insert into innodb_dynamic select * from innodb_normal;
 commit;
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
 alter table innodb_normal engine=innodb page_compressed=DEFAULT;
 show create table innodb_normal;
@@ -71,5 +67,3 @@ drop procedure innodb_insert_proc;
 drop table innodb_normal;
 drop table innodb_compact;
 drop table innodb_dynamic;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb-page_encryption_log_encryption.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 Level	Code	Message
@@ -62,8 +60,6 @@ variable_value > 0
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
 variable_value >= 0
 1
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 update innodb_normal set c1 = c1 +1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_compressed set c1 = c1 + 1;
@@ -116,10 +112,6 @@ drop table innodb_compact;
 drop table innodb_compressed;
 drop table innodb_dynamic;
 drop table innodb_redundant;
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=InnoDB ENCRYPTION_KEY_ID=2 ENCRYPTED=YES;
 INSERT INTO t1 VALUES (1),(2);
 # Restarting server...

mysql-test/suite/encryption/r/innodb_encryption_discard_import.result

-call mtr.add_suppression("InnoDB: Table .* tablespace is set as discarded.");
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
 CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
 CREATE TABLE t3 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB row_format=compressed encrypted=yes;

mysql-test/suite/encryption/r/innodb_encryption_filekeys.result

 call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encrypt_tables = OFF;
 SET GLOBAL innodb_encryption_threads = 4;
 CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB;
@@ -65,7 +61,5 @@ COUNT(1)
 SELECT COUNT(1) FROM t5;
 COUNT(1)
 400
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
 drop table t1,t2,t3,t4, t5;
 set GLOBAL innodb_default_encryption_key_id=1;

mysql-test/suite/encryption/r/innodb_encryption_is.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 CREATE TABLE t1 (c VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=1;
 CREATE TABLE t2 (c VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=2;
 INSERT INTO t1 VALUES ('foobar');
@@ -14,5 +10,3 @@ NAME	ENCRYPTION_SCHEME	MIN_KEY_VERSION	CURRENT_KEY_VERSION	CURRENT_KEY_ID
 test/t1	1	1	1	1
 test/t2	1	1	1	2
 DROP TABLE t1, t2;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb_encryption_row_compressed.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_compressed1(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed encrypted=yes;
 create table innodb_compressed2(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=1 encrypted=yes;
 create table innodb_compressed3(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=2 encrypted=yes;
@@ -27,10 +23,6 @@ NOT FOUND /private/ in innodb_compressed2.ibd
 NOT FOUND /private/ in innodb_compressed3.ibd
 # t4 yes on expecting NOT FOUND
 NOT FOUND /private/ in innodb_compressed4.ibd
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 select * from innodb_compressed1 where d = 20;
 c1	d	a	b
 1	20	private	evenmoreprivate
@@ -155,5 +147,3 @@ drop table innodb_compressed1;
 drop table innodb_compressed2;
 drop table innodb_compressed3;
 drop table innodb_compressed4;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb_encryption_tables.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact;
 create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic;
@@ -105,10 +101,6 @@ variable_value >= 0
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_page_decompressed';
 variable_value >= 0
 1
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 update innodb_normal set c1 = c1 + 1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_dynamic set c1 = c1 + 1;
@@ -163,5 +155,3 @@ drop table innodb_compact;
 drop table innodb_dynamic;
 drop table innodb_compressed;
 drop table innodb_redundant;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/innodb_first_page.result

-call mtr.add_suppression("InnoDB: New log files created, LSN");
-call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables");
-shutdown;
 create table t1 (a int);
 drop table t1;

mysql-test/suite/encryption/r/innodb_lotoftables.result

 SET GLOBAL innodb_fast_shutdown=0;
-SET GLOBAL innodb_file_per_table = ON;
 SHOW VARIABLES LIKE 'innodb_encrypt%';
 Variable_name	Value
 innodb_encrypt_log	OFF

mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result

-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
 CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
 CREATE TABLE t3 (id INT, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;

mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result

 # Restart mysqld --loose-file-key-management-filename=keys2.txt
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 Level	Code	Message
@@ -106,10 +102,6 @@ variable_value >= 0
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
 variable_value >= 0
 1
-SET GLOBAL innodb_file_format = `Barracuda`;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET GLOBAL innodb_file_per_table = ON;
 alter table innodb_compact engine=innodb encryption_key_id = 2;
 alter table innodb_compressed engine=innodb encryption_key_id = 3;
 alter table innodb_dynamic engine=innodb encryption_key_id = 4;
@@ -155,5 +147,3 @@ drop table innodb_compact;
 drop table innodb_compressed;
 drop table innodb_dynamic;
 drop table innodb_redundant;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/suite/encryption/r/tempfiles.result

@@ -26,6 +26,7 @@ i	10
 j	10
 drop table t1;
 set global binlog_cache_size=8192;
+connect con1, localhost, root;
 create table t1 (a text) engine=innodb;
 start transaction;
 insert t1 select repeat(seq, 1000) from seq_1_to_15;
@@ -34,6 +35,8 @@ start transaction;
 insert t1 select repeat(seq, 1000) from seq_1_to_8;
 commit;
 drop table t1;
+disconnect con1;
+connect con2, localhost, root;
 create table t1 (a text) engine=innodb;
 start transaction;
 insert t1 select repeat(seq, 1000) from seq_1_to_15;
@@ -43,4 +46,6 @@ rollback to savepoint foo;
 insert t1 select repeat(seq, 1000) from seq_31_to_40;
 commit;
 drop table t1;
+disconnect con2;
+connection default;
 set global binlog_cache_size=default;

mysql-test/suite/encryption/t/filekeys_badtest.inc

 -- source include/not_embedded.inc
--- source include/have_xtradb.inc
+-- source include/have_innodb.inc
 -- source filekeys_plugin.inc
 
 --eval call mtr.add_suppression("$SEARCH_PATTERN")
@@ -7,7 +7,6 @@ call mtr.add_suppression("Plugin 'file_key_management' init function returned er
 call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
 
 --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_RANGE= -10000
 --source include/search_pattern_in_file.inc
 
 --error ER_CANT_CREATE_TABLE

mysql-test/suite/encryption/t/filekeys_goodtest.inc

--- source include/have_xtradb.inc
+-- source include/have_innodb.inc
 -- source filekeys_plugin.inc
 
 create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;

mysql-test/suite/encryption/t/innochecksum.test

@@ -13,14 +13,8 @@ if (!$INNOCHECKSUM) {
   --die Need innochecksum binary
 }
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # zlib
 set global innodb_compression_algorithm = 1;
 
@@ -96,6 +90,4 @@ DROP TABLE t1, t2, t3, t4, t5;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log

mysql-test/suite/encryption/t/innodb-bad-key-change.test

@@ -8,7 +8,8 @@
 # table exists and encryption service is not available.
 #
 
-call mtr.add_suppression("Plugin 'file_key_management'");
+call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
+call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
 call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\.");
 call mtr.add_suppression("File '.*mysql-test.std_data.keysbad3\\.txt' not found");
 
@@ -37,15 +38,14 @@ SELECT * FROM t1;
 
 --error ER_GET_ERRMSG
 SELECT * FROM t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
 -- source include/restart_mysqld.inc
-
---replace_regex /tablespace [1-9][0-9]*/tablespace /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 DROP TABLE t1;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 #
@@ -68,46 +68,45 @@ INSERT INTO t2 VALUES ('foobar',1,2);
 
 --error ER_GET_ERRMSG
 SELECT * FROM t2;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 SELECT * FROM t2 where id = 1;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 SELECT * FROM t2 where b = 1;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
---replace_regex /tablespace [1-9][0-9]*/tablespace /
 --error ER_GET_ERRMSG
 INSERT INTO t2 VALUES ('tmp',3,3);
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 DELETE FROM t2 where b = 3;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 DELETE FROM t2 where id = 3;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 UPDATE t2 set b = b +1;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 OPTIMIZE TABLE t2;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 ALTER TABLE t2 ADD COLUMN d INT;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 ANALYZE TABLE t2;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
 TRUNCATE TABLE t2;
---replace_regex /tablespace [1-9][0-9]*/tablespace / /key_id [1-9][0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 DROP TABLE t2;

mysql-test/suite/encryption/t/innodb-bad-key-change2.test

@@ -11,14 +11,15 @@
 call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t1(new)?\\.ibd' cannot be decrypted\\.");
 # Suppression for builds where file_key_management plugin is linked statically
 call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
-call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded.");
+call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded\\.");
 
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
 --source include/restart_mysqld.inc
 
 SET GLOBAL innodb_file_per_table = ON;
 
-CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
+CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB
+ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
 
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
@@ -26,26 +27,24 @@ INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
 
 --error ER_GET_ERRMSG
 SELECT * FROM t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 --error ER_GET_ERRMSG
-ALTER TABLE t1 engine=InnoDB;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+ALTER TABLE t1 ENGINE=InnoDB;
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
-
 OPTIMIZE TABLE t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 CHECK TABLE t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
 --source include/restart_mysqld.inc
 
 let MYSQLD_DATADIR =`SELECT @@datadir`;
-let MYSQLD_TMPDIR = `SELECT @@tmpdir`;
 
 FLUSH TABLES t1 FOR EXPORT;
 perl;
@@ -58,7 +57,7 @@ UNLOCK TABLES;
 --source include/restart_mysqld.inc
 
 # Discard should pass even with incorrect keys
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 ALTER TABLE t1 DISCARD TABLESPACE;
 
 perl;
@@ -67,32 +66,23 @@ ib_discard_tablespaces("test", "t1");
 ib_restore_tablespaces("test", "t1");
 EOF
 
+
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
 --source include/restart_mysqld.inc
 
 ALTER TABLE t1 IMPORT TABLESPACE;
 SHOW CREATE TABLE t1;
 
---let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
+--let $restart_parameters= --innodb-encrypt-tables --plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
 --source include/restart_mysqld.inc
 
 # Rename table should pass even with incorrect keys
 RENAME TABLE t1 TO t1new;
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 
 # Alter table rename is not allowed with incorrect keys
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
 --error ER_GET_ERRMSG
 ALTER TABLE t1new RENAME TO t2new;
-
 # Drop should pass even with incorrect keys
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 DROP TABLE t1new;
-
-#
-# Reset environment
-#
---let $restart_parameters=
---source include/restart_mysqld.inc
-
---error ER_BAD_TABLE_ERROR
-DROP TABLE t1, t1new;

mysql-test/suite/encryption/t/innodb-bad-key-change3.test

@@ -9,12 +9,8 @@
 # MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing page compressed and encrypted tablespace using incorrect keys
 #
 
-call mtr.add_suppression("InnoDB: Tablespace for table \`test\`.\`t1\` is set as discarded.");
-
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
+call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
+call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");
 
 --let $MYSQLD_TMPDIR = `SELECT @@tmpdir`
 --let $MYSQLD_DATADIR = `SELECT @@datadir`
@@ -33,11 +29,7 @@ EOF
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 set global innodb_compression_algorithm = 1;
---enable_warnings
 
 CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1 ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 SHOW WARNINGS;
@@ -45,6 +37,8 @@ SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES (1,'foobar'),(2,'barfoo');
 let MYSQLD_DATADIR =`SELECT @@datadir`;
 FLUSH TABLE t1 FOR EXPORT;
+--echo # List before copying files
+--list_files $MYSQLD_DATADIR/test
 perl;
 do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl";
 ib_backup_tablespaces("test", "t1");
@@ -73,11 +67,6 @@ EOF
 --source include/wait_until_connected_again.inc
 --source include/restart_mysqld.inc
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
---enable_warnings
-
 --error ER_GET_ERRMSG
 ALTER TABLE t1 IMPORT TABLESPACE;
 SHOW CREATE TABLE t1;
@@ -106,12 +95,6 @@ EOF
 DROP TABLE t1;
 
 # reset system
---disable_warnings
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log
---enable_warnings
 
 --remove_file $MYSQLTEST_VARDIR/keys1.txt
 --remove_file $MYSQLTEST_VARDIR/keys2.txt

mysql-test/suite/encryption/t/innodb-bad-key-change4.test

@@ -16,20 +16,21 @@ call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
 
 SET GLOBAL innodb_file_per_table = ON;
 
-CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
+CREATE TABLE t1 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB
+ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
 INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
 
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
 --source include/restart_mysqld.inc
 
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 OPTIMIZE TABLE t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
  
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 CHECK TABLE t1;
---replace_regex /tablespace [0-9]*/tablespace / /key_id [0-9]*/key_id /
+--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
 SHOW WARNINGS;
 
 --let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt

mysql-test/suite/encryption/t/innodb-discard-import-change.test

@@ -6,17 +6,9 @@
 
 call mtr.add_suppression("InnoDB: Table .* tablespace is set as discarded");
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $innodb_compression_algo = `SELECT @@innodb_compression_algorithm`;
---enable_query_log
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_compression_algorithm = 1;
---enable_warnings
 
 create table t1(c1 bigint not null primary key auto_increment, b char(200))  engine=innodb encrypted=yes encryption_key_id=4;
 create table t2(c1 bigint not null primary key auto_increment, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
@@ -121,11 +113,6 @@ SELECT COUNT(*) FROM t5;
 DROP TABLE t1,t2,t3,t4,t5,t6;
 
 # reset system
---disable_warnings
 --disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algo;
 --enable_query_log
---enable_warnings
-

mysql-test/suite/encryption/t/innodb-discard-import.test

@@ -13,17 +13,8 @@
 call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
 call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $innodb_compression_algo = `SELECT @@innodb_compression_algorithm`;
---enable_query_log
-
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_compression_algorithm = 1;
---enable_warnings
 
 --let $MYSQLD_TMPDIR = `SELECT @@tmpdir`
 --let $MYSQLD_DATADIR = `SELECT @@datadir`
@@ -126,10 +117,6 @@ DROP PROCEDURE innodb_insert_proc;
 DROP TABLE t1,t2,t3,t4;
 
 # reset system
---disable_warnings
 --disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algo;
 --enable_query_log
---enable_warnings

mysql-test/suite/encryption/t/innodb-encryption-alter.test

@@ -5,15 +5,9 @@
 # MDEV-8817: Failing assertion: new_state->key_version != ENCRYPTION_KEY_VERSION_INVALID
 #
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $encrypt_tables = `SELECT @@innodb_encrypt_tables`;
 let $threads = `SELECT @@innodb_encryption_threads`;
---enable_query_log
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encrypt_tables = ON;
 SET GLOBAL innodb_encryption_threads = 4;
 
@@ -91,8 +85,6 @@ drop table t1,t2;
 
 # reset system
 --disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 EVAL SET GLOBAL innodb_encrypt_tables = $encrypt_tables;
 EVAL SET GLOBAL innodb_encryption_threads = $threads;
 --enable_query_log

mysql-test/suite/encryption/t/innodb-log-encrypt-crash.opt

---innodb-encrypt-log=ON
---plugin-load-add=$FILE_KEY_MANAGEMENT_SO
---loose-file-key-management
---loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt
---file-key-management-encryption-algorithm=aes_cbc
---innodb-buffer-pool-size=128M

mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test

--- source include/have_innodb.inc
--- source include/not_embedded.inc
-# test takes very long time on debug build
--- source include/not_debug.inc
--- source include/big_test.inc
--- source filekeys_plugin.inc
-
-call mtr.add_suppression("InnoDB: New log files created, LSN=.*");
-call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables.");
-call mtr.add_suppression("InnoDB: Error: Table .*");
-
-#
-# MDEV-9422: Checksum errors on restart when killing busy instance that uses encrypted XtraDB tables
-#
-
-CREATE TABLE t1 (
-  pk bigint auto_increment,
-  col_int int,
-  col_int_key int,
-  col_char char(12),
-  col_char_key char(12),
-  primary key (pk),
-  key (`col_int_key` ),
-  key (`col_char_key` )
-) ENGINE=InnoDB;
-CREATE TABLE t2 LIKE t1;
-
-INSERT INTO t1 VALUES (NULL,1,1,'foo','foo'),(NULL,2,2,'bar','bar'),(NULL,3,3,'baz','baz'),(NULL,4,4,'qux','qux');
-INSERT INTO t2 
-  SELECT NULL, a1.col_int, a1.col_int_key, a1.col_char, a1.col_char_key 
-    FROM t1 a1, t1 a2, t1 a3, t1 a4, t1 a5, t1 a6, t1 a7, t1 a8, t1 a9, t1 a10;
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 0
---source include/wait_until_disconnected.inc
-
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---enable_reconnect
---source include/wait_until_connected_again.inc
-
-DROP TABLE t1, t2;

mysql-test/suite/encryption/t/innodb-log-encrypt.opt

---innodb-encrypt-log=ON
---innodb-encrypt-tables=FORCE
---plugin-load-add=$FILE_KEY_MANAGEMENT_SO
---loose-file-key-management
---loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt
---file-key-management-encryption-algorithm=aes_cbc

mysql-test/suite/encryption/t/innodb-log-encrypt.test

--- source include/have_innodb.inc
--- source include/not_embedded.inc
--- source filekeys_plugin.inc
-
-#
-# MDEV-9011: Redo log encryption does not work
-#
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
-create table t1(c1 bigint not null, b char(200), c varchar(200)) engine=innodb encrypted=yes encryption_key_id=1;
-show warnings;
-
-delimiter //;
-create procedure innodb_insert_proc (repeat_count int)
-begin
-  declare current_num int;
-  set current_num = 0;
-  while current_num < repeat_count do
-    insert into t1 values(current_num, substring(MD5(RAND()), -64), REPEAT('privatejanprivate',10));
-    set current_num = current_num + 1;
-  end while;
-end//
-delimiter ;//
-commit;
-
-begin;
-call innodb_insert_proc(2000);
-commit;
-
-update t1 set c1 = c1 +1;
-select count(*) from t1;
-
---let $MYSQLD_DATADIR=`select @@datadir`
---let ib1_IBD = $MYSQLD_DATADIR/ibdata1
---let t1_IBD = $MYSQLD_DATADIR/test/t1.ibd
---let log0 = $MYSQLD_DATADIR/ib_logfile0
---let log1 = $MYSQLD_DATADIR/ib_logfile1
---let SEARCH_RANGE = 10000000
---let SEARCH_PATTERN=privatejanprivate
-
--- source include/kill_mysqld.inc
-
---echo # ibdata1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$ib1_IBD
--- source include/search_pattern_in_file.inc
---echo # t1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$t1_IBD
--- source include/search_pattern_in_file.inc
---echo # log0 yes on expecting NOT FOUND
--- let SEARCH_FILE=$log0
--- source include/search_pattern_in_file.inc
---echo # log1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$log1
--- source include/search_pattern_in_file.inc
-
---echo # Restart mysqld --innodb_encrypt_log=0
--- let $restart_parameters=--innodb_encrypt_log=0
--- source include/start_mysqld.inc
-
-insert into t1 values(5000, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5001, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5002, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5003, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-insert into t1 values(5004, substring(MD5(RAND()), -64), REPEAT('publicmessage',10));
-
---let SEARCH_PATTERN=privatejanprivate
---echo # ibdata1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$ib1_IBD
--- source include/search_pattern_in_file.inc
---echo # t1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$t1_IBD
--- source include/search_pattern_in_file.inc
---echo # log0 yes on expecting NOT FOUND
--- let SEARCH_FILE=$log0
--- source include/search_pattern_in_file.inc
---echo # log1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$log1
--- source include/search_pattern_in_file.inc
-
---let SEARCH_PATTERN=publicmessage
---echo # ibdata1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$ib1_IBD
--- source include/search_pattern_in_file.inc
---echo # t1 yes on expecting NOT FOUND
--- let SEARCH_FILE=$t1_IBD
--- source include/search_pattern_in_file.inc
---echo # log0 no on expecting FOUND/NOTFOUND depending where insert goes
--- let SEARCH_FILE=$log0
--- source include/search_pattern_in_file.inc
---echo # log1 no on expecting FOUND/NOTFOUND depending where insert goes
--- let SEARCH_FILE=$log1
--- source include/search_pattern_in_file.inc
-
-drop procedure innodb_insert_proc;
-drop table t1;

mysql-test/suite/encryption/t/innodb-page_encryption-32k.test

@@ -5,20 +5,12 @@
 --source include/have_innodb_32k.inc
 --source include/have_file_key_management_plugin.inc
 
-call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
-
---disable_query_log
-# These values can change during the test
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
+--error ER_CANT_CREATE_TABLE
 create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
+show warnings;
+create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
 create table innodb_redundant(c1 bigint not null, b char(200))  engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
 
 show create table innodb_compact;
@@ -88,9 +80,3 @@ drop table innodb_normal;
 drop table innodb_compact;
 drop table innodb_dynamic;
 drop table innodb_redundant;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb-page_encryption.test

 -- source include/have_innodb.inc
 -- source include/have_file_key_management_plugin.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
@@ -85,9 +77,6 @@ SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_
 
 --source include/restart_mysqld.inc
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 update innodb_normal set c1 = c1 +1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_compressed set c1 = c1 + 1;
@@ -124,9 +113,6 @@ show create table innodb_redundant;
 
 --source include/restart_mysqld.inc
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 show create table innodb_compact;
 show create table innodb_compressed;
 show create table innodb_dynamic;
@@ -161,9 +147,3 @@ drop table innodb_compressed;
 drop table innodb_dynamic;
 drop table innodb_redundant;
 drop table innodb_defkey;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb-page_encryption_compression.test

 -- source include/have_innodb.inc
--- source include/have_file_key_management_plugin.inc
 -- source include/not_embedded.inc
+-- source include/have_file_key_management_plugin.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # zlib
 set global innodb_compression_algorithm = 1;
---enable_warnings
 
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
 show warnings;
@@ -51,12 +43,8 @@ let $wait_condition= select variable_value > 0 from information_schema.global_st
 --let $restart_parameters=--innodb-encrypt-tables=OFF
 --source include/restart_mysqld.inc
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 # zlib
 set global innodb_compression_algorithm = 1;
---enable_warnings
 
 alter table innodb_normal engine=innodb page_compressed=DEFAULT;
 show create table innodb_normal;
@@ -64,7 +52,6 @@ alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEF
 show create table innodb_compact;
 alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
 show create table innodb_dynamic;
-
 let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_PAGE_DECOMPRESSED';
 --source include/wait_condition.inc
 
@@ -76,6 +63,4 @@ drop table innodb_dynamic;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 --enable_query_log

mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test

@@ -2,15 +2,6 @@
 -- source include/not_embedded.inc
 -- source include/have_file_key_management_plugin.inc
 
-#call mtr.add_suppression("KeyID 0 not found or with error. Check the key and the log.*");
-#call mtr.add_suppression("Disabling redo log encryp.*");
-#call mtr.add_suppression("InnoDB: Redo log crypto: Can't initialize to key version.*");
-
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
---enable_warnings
-
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
@@ -57,11 +48,6 @@ SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_
 
 --source include/restart_mysqld.inc
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
---enable_warnings
-
 update innodb_normal set c1 = c1 +1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_compressed set c1 = c1 + 1;
@@ -99,9 +85,6 @@ drop table innodb_redundant;
 #
 # MDEV-8143: InnoDB: Database page corruption on disk or a failed file read
 #
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=InnoDB ENCRYPTION_KEY_ID=2 ENCRYPTED=YES;
 INSERT INTO t1 VALUES (1),(2);
 

mysql-test/suite/encryption/t/innodb_encryption-page-compression.test

 -- source include/have_innodb.inc
 -- source include/have_example_key_management_plugin.inc
 
---disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $innodb_encrypt_tables_orig = `SELECT @@innodb_encrypt_tables`;
 let $innodb_encryption_threads_orig = `SELECT @@innodb_encryption_threads`;
---enable_query_log
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encryption_threads = 4;
 SET GLOBAL innodb_encrypt_tables = on;
---enable_warnings
 
 # zlib
 set global innodb_compression_algorithm = 1;
@@ -128,9 +120,6 @@ drop table innodb_page_compressed9;
 # reset system
 --disable_query_log
 EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algorithm_orig;
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 EVAL SET GLOBAL innodb_encrypt_tables = $innodb_encrypt_tables_orig;
 EVAL SET GLOBAL innodb_encryption_threads = $innodb_encryption_threads_orig;
 --enable_query_log
-

mysql-test/suite/encryption/t/innodb_encryption_discard_import.test

@@ -3,10 +3,7 @@
 -- source include/not_valgrind.inc
 -- source include/not_embedded.inc
 
-call mtr.add_suppression("InnoDB: Table .* tablespace is set as discarded.");
-
-let $MYSQLD_TMPDIR = `SELECT @@tmpdir`;
-let $MYSQLD_DATADIR = `SELECT @@datadir`;
+let MYSQLD_DATADIR = `SELECT @@datadir`;
 
 --let SEARCH_RANGE = 10000000
 --let $id = `SELECT RAND()`
@@ -14,16 +11,6 @@ let $MYSQLD_DATADIR = `SELECT @@datadir`;
 --let t2_IBD = $MYSQLD_DATADIR/test/t2.ibd
 --let t3_IBD = $MYSQLD_DATADIR/test/t3.ibd
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
---enable_warnings
-
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
 CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
 CREATE TABLE t3 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB row_format=compressed encrypted=yes;
@@ -68,7 +55,6 @@ set autocommit=1;
 -- let SEARCH_FILE=$t3_IBD
 -- source include/search_pattern_in_file.inc
 
-let MYSQLD_DATADIR =`SELECT @@datadir`;
 --list_files $MYSQLD_DATADIR/test
 FLUSH TABLES t1, t2, t3 FOR EXPORT;
 perl;
@@ -153,11 +139,3 @@ SELECT COUNT(1) FROM t3;
 
 DROP PROCEDURE innodb_insert_proc;
 DROP TABLE t1, t2, t3;
-
-# reset system
---disable_warnings
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log
---enable_warnings

mysql-test/suite/encryption/t/innodb_encryption_filekeys.test

@@ -5,15 +5,9 @@
 
 call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $encrypt_tables = `SELECT @@innodb_encrypt_tables`;
 let $threads = `SELECT @@innodb_encryption_threads`;
---enable_query_log
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encrypt_tables = OFF;
 SET GLOBAL innodb_encryption_threads = 4;
 
@@ -133,8 +127,6 @@ SELECT COUNT(1) FROM t5;
 
 # reset system
 --disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
 EVAL SET GLOBAL innodb_encrypt_tables = $encrypt_tables;
 EVAL SET GLOBAL innodb_encryption_threads = $threads;
 --enable_query_log
@@ -142,4 +134,3 @@ EVAL SET GLOBAL innodb_encryption_threads = $threads;
 drop table t1,t2,t3,t4, t5;
 
 set GLOBAL innodb_default_encryption_key_id=1;
-

mysql-test/suite/encryption/t/innodb_encryption_is.test

 -- source include/have_innodb.inc
 -- source include/have_file_key_management_plugin.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 CREATE TABLE t1 (c VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=1;
 CREATE TABLE t2 (c VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=2;
 INSERT INTO t1 VALUES ('foobar');
@@ -23,9 +15,3 @@ FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION
 WHERE NAME LIKE '%t1' OR NAME LIKE '%t2';
 
 DROP TABLE t1, t2;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb_encryption_row_compressed.test

@@ -2,14 +2,6 @@
 -- source include/have_file_key_management_plugin.inc
 -- source include/not_embedded.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table innodb_compressed1(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed encrypted=yes;
 create table innodb_compressed2(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=1 encrypted=yes;
 create table innodb_compressed3(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=2 encrypted=yes;
@@ -52,9 +44,6 @@ insert into innodb_compressed4 select * from innodb_compressed1;
 -- let SEARCH_FILE=$t4_IBD
 -- source include/search_pattern_in_file.inc
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 select * from innodb_compressed1 where d = 20;
 select * from innodb_compressed1 where d = 30;
 select * from innodb_compressed2 where d = 20;
@@ -117,9 +106,3 @@ drop table innodb_compressed1;
 drop table innodb_compressed2;
 drop table innodb_compressed3;
 drop table innodb_compressed4;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb_encryption_tables.test

@@ -2,14 +2,6 @@
 -- source include/have_example_key_management_plugin.inc
 -- source include/not_embedded.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact;
 create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic;
@@ -73,9 +65,6 @@ SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_
 
 --source include/restart_mysqld.inc
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 update innodb_normal set c1 = c1 + 1;
 update innodb_compact set c1 = c1 + 1;
 update innodb_dynamic set c1 = c1 + 1;
@@ -106,9 +95,3 @@ drop table innodb_compact;
 drop table innodb_dynamic;
 drop table innodb_compressed;
 drop table innodb_redundant;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb_first_page.test

@@ -5,25 +5,14 @@
 --source include/have_innodb.inc
 --source include/have_file_key_management_plugin.inc
 
-call mtr.add_suppression("InnoDB: New log files created, LSN");
-call mtr.add_suppression("InnoDB: Creating foreign key constraint system tables");
-
-let datadir=`select @@datadir`;
-
---exec echo wait > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-
-shutdown;
-
---source include/wait_until_disconnected.inc
+let $datadir=`select @@datadir`;
+--source include/shutdown_mysqld.inc
 
 --remove_file $datadir/ib_logfile0
 --remove_file $datadir/ib_logfile1
 --remove_file $datadir/ibdata1
 
---exec echo restart > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-
---enable_reconnect
---source include/wait_until_connected_again.inc
+--source include/start_mysqld.inc
 
 create table t1 (a int);
 

mysql-test/suite/encryption/t/innodb_lotoftables.test

@@ -6,7 +6,6 @@
 -- source include/not_embedded.inc
 
 --disable_query_log
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
 let $innodb_encryption_threads_orig = `SELECT @@global.innodb_encryption_threads`;
 --enable_query_log
 
@@ -14,8 +13,6 @@ let $innodb_encryption_threads_orig = `SELECT @@global.innodb_encryption_threads
 SET GLOBAL innodb_fast_shutdown=0;
 --source include/restart_mysqld.inc
 
-SET GLOBAL innodb_file_per_table = ON;
-
 SHOW VARIABLES LIKE 'innodb_encrypt%';
 
 #
@@ -273,6 +270,5 @@ drop database innodb_encrypted_2;
 drop database innodb_encrypted_3;
 
 --disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
 EVAL SET GLOBAL innodb_encryption_threads = $innodb_encryption_threads_orig;
 --enable_query_log

mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test

@@ -3,11 +3,6 @@
 # test uses restart
 -- source include/not_embedded.inc
 
---disable_warnings
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
---enable_warnings
-
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
 CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
 CREATE TABLE t3 (id INT, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;

mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test

@@ -7,14 +7,6 @@
 -- let $restart_parameters=--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
 -- source include/restart_mysqld.inc
 
---disable_query_log
-let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
-let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
---enable_query_log
-
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 show warnings;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=2;
@@ -65,9 +57,6 @@ select * from innodb_redundant;
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
 SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
 
-SET GLOBAL innodb_file_format = `Barracuda`;
-SET GLOBAL innodb_file_per_table = ON;
-
 alter table innodb_compact engine=innodb encryption_key_id = 2;
 alter table innodb_compressed engine=innodb encryption_key_id = 3;
 alter table innodb_dynamic engine=innodb encryption_key_id = 4;
@@ -88,9 +77,3 @@ drop table innodb_compact;
 drop table innodb_compressed;
 drop table innodb_dynamic;
 drop table innodb_redundant;
-
-# reset system
---disable_query_log
-EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
-EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
---enable_query_log

mysql-test/suite/encryption/t/innodb_scrub.opt

@@ -2,8 +2,6 @@
 --innodb-background-scrub-data-uncompressed=OFF
 --innodb-encrypt-tables=OFF
 --innodb-encryption-threads=0
---innodb-file-format=Barracuda
---innodb-file-per-table=1
 --innodb-immediate-scrub-data-uncompressed=ON
 --loose-innodb-debug-force-scrubbing=ON
 --innodb-tablespaces-scrubbing

mysql-test/suite/encryption/t/innodb_scrub.test

@@ -7,7 +7,7 @@ let INNODB_PAGE_SIZE= `select @@innodb_page_size`;
 
 create table snapshot_status engine = myisam
 select * from information_schema.global_status
-where variable_name like 'innodb_scrub%';
+where variable_name like 'innodb_scrub_background%';
 
 let $rowcount=500;
 let $maxformatno= 4;

mysql-test/suite/encryption/t/innodb_scrub_background.opt

---innodb-file-per-table=1
---innodb-file-format=Barracuda
 --innodb-immediate-scrub-data-uncompressed=OFF
 --innodb-background-scrub-data-uncompressed=ON
 --innodb-background-scrub-data-compressed=ON

mysql-test/suite/encryption/t/tempfiles.test

@@ -7,9 +7,7 @@ source include/have_sequence.inc;
 # Row binlog format to fill binlog cache faster
 source include/have_binlog_format_row.inc;
 
-# Nothing XtraDB specific in this test, it just needs *some* transactional
-# engine. But there's no need to run it twice for InnoDB and XtraDB.
-source include/have_xtradb.inc;
+source include/have_innodb.inc;
 
 #
 # MyISAM messing around with IO_CACHE::file