MDEV-29985 Remove the parameter innodb_file_per_tablebb-11.0-MDEV-29985

This follows up commit e581396b7aea94485580d2c9edaa9c5df647f2b7
(MDEV-29983), which deprecated the parameter.

21 files changed, 9 insertions, 338 deletions

diff --git a/mysql-test/suite/innodb/r/alter_rename_existing.result b/mysql-test/suite/innodb/r/alter_rename_existing.result
index e4fee341964..73fb22b03dd 100644
--- a/mysql-test/suite/innodb/r/alter_rename_existing.result
+++ b/mysql-test/suite/innodb/r/alter_rename_existing.result
@@ -33,58 +33,6 @@ a	b
 ALTER TABLE t2 RENAME TO t1;
 ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 184 "Tablespace already exists")
 #
-# Create another t1, but in the system tablespace.
-#
-SET GLOBAL innodb_file_per_table=OFF;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-CREATE TABLE t1 (a SERIAL, b CHAR(20)) ENGINE=InnoDB;
-INSERT INTO t1(b) VALUES('one'), ('two'), ('three');
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `b` char(20) DEFAULT NULL,
-  UNIQUE KEY `a` (`a`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-SELECT name, space=0 FROM information_schema.innodb_sys_tables WHERE name = 'test/t1';
-name	space=0
-test/t1	1
-#
-# ALTER TABLE from system tablespace to system tablespace
-#
-ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=INPLACE;
-ALTER TABLE t1 ADD COLUMN d INT, ALGORITHM=COPY;
-#
-# Try to move t1 from the system tablespace to a file-per-table
-# while a blocking t1.ibd file exists.
-#
-SET GLOBAL innodb_file_per_table=ON;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
-ERROR HY000: Tablespace for table 'test/#sql-ib' exists. Please DISCARD the tablespace before IMPORT
-ALTER TABLE t1 FORCE, ALGORITHM=COPY;
-ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 184 "Tablespace already exists")
-#
-# Delete the blocking file called MYSQLD_DATADIR/test/t1.ibd
-# Move t1 to file-per-table using ALGORITHM=INPLACE with no blocking t1.ibd.
-#
-ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `b` char(20) DEFAULT NULL,
-  `c` int(11) DEFAULT NULL,
-  `d` int(11) DEFAULT NULL,
-  UNIQUE KEY `a` (`a`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-SELECT name, space=0 FROM information_schema.innodb_sys_tables WHERE name = 'test/t1';
-name	space=0
-test/t1	0
-DROP TABLE t1;
-#
 # Rename t2.ibd to t1.ibd.
 #
 ALTER TABLE t2 RENAME TO t1;
@@ -97,5 +45,3 @@ a	b
 2	two
 3	three
 DROP TABLE t1;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/innodb/r/default_row_format_compatibility.result b/mysql-test/suite/innodb/r/default_row_format_compatibility.result
index 100b9d594bc..961b5da66cb 100644
--- a/mysql-test/suite/innodb/r/default_row_format_compatibility.result
+++ b/mysql-test/suite/innodb/r/default_row_format_compatibility.result
@@ -6,9 +6,6 @@ SET GLOBAL innodb_default_row_format=Compact;
 SELECT @@innodb_default_row_format;
 @@innodb_default_row_format
 compact
-SELECT @@innodb_file_per_table;
-@@innodb_file_per_table
-1
 CREATE TABLE tab(a INT) ENGINE=InnoDB;
 SHOW TABLE STATUS LIKE 'tab';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
diff --git a/mysql-test/suite/innodb/r/dropdb_cs.result b/mysql-test/suite/innodb/r/dropdb_cs.result
deleted file mode 100644
index 3837bf9e3f5..00000000000
--- a/mysql-test/suite/innodb/r/dropdb_cs.result
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# MDEV-28802 DROP DATABASE in InnoDB still is case-insensitive
-#
-SET @save_fpt=@@GLOBAL.innodb_file_per_table;
-SET GLOBAL innodb_file_per_table=0;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-CREATE DATABASE Db;
-CREATE TABLE Db.t1 (c1 INT KEY) ENGINE=InnoDB;
-CREATE DATABASE DB;
-DROP DATABASE DB;
-SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
-NAME
-Db/t1
-DROP DATABASE Db;
-SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
-TABLE_ID	NAME	FLAG	N_COLS	SPACE	ROW_FORMAT	ZIP_PAGE_SIZE	SPACE_TYPE
-SET GLOBAL innodb_file_per_table=@save_fpt;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/innodb/r/file_format_defaults.result b/mysql-test/suite/innodb/r/file_format_defaults.result
index ee30b09dabf..633ddcdcd71 100644
--- a/mysql-test/suite/innodb/r/file_format_defaults.result
+++ b/mysql-test/suite/innodb/r/file_format_defaults.result
@@ -2,9 +2,6 @@ call mtr.add_suppression("InnoDB: Cannot add field `c1` in table `test`\\.`tab0`
 SELECT @@innodb_strict_mode;
 @@innodb_strict_mode
 1
-SELECT @@innodb_file_per_table;
-@@innodb_file_per_table
-1
 SET SQL_MODE=strict_all_tables;
 CREATE TABLE tab0 (c1 VARCHAR(65530), KEY(c1(3073))) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
 Warnings:
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index 819ca949c88..174c23f069a 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -120,9 +120,6 @@ ALTER TABLE t2 IMPORT TABLESPACE;
 Warnings:
 Warning	1810	IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification
 DROP TABLE t2;
-SELECT @@innodb_file_per_table;
-@@innodb_file_per_table
-1
 CREATE TABLE t1(
 c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c2 INT) ENGINE=InnoDB;
@@ -283,28 +280,6 @@ c1	c2
 16	1
 unlink: t1.cfg
 DROP TABLE t1;
-SET GLOBAL innodb_file_per_table = 0;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-CREATE TABLE t1(
-c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-c2 INT) ENGINE=InnoDB;
-INSERT INTO t1 SELECT seq,1 FROM seq_1_to_16;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` int(11) DEFAULT NULL,
-  PRIMARY KEY (`c1`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-FLUSH TABLES t1 FOR EXPORT;
-Warnings:
-Warning	1809	Table `test`.`t1` in system tablespace
-UNLOCK TABLES;
-DROP TABLE t1;
-SET GLOBAL innodb_file_per_table = 1;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
 CREATE TABLE t1(
 c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index 742a822baa0..9bec5f787fd 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -3181,11 +3181,11 @@ affected rows: 1
 info: Rows matched: 2  Changed: 1  Warnings: 0
 drop table t1;
 create table t1 (id int) comment='this is a comment' engine=innodb;
-select table_comment, data_free > 0 as data_free_is_set
+select table_comment, data_free
 from information_schema.tables
 where table_schema='test' and table_name = 't1';
-table_comment	data_free_is_set
-this is a comment	1
+table_comment	data_free
+this is a comment	0
 drop table t1;
 connection default;
 CREATE TABLE t1 (
diff --git a/mysql-test/suite/innodb/r/innodb_bug56947.result b/mysql-test/suite/innodb/r/innodb_bug56947.result
deleted file mode 100644
index a4ed3bfcfaa..00000000000
--- a/mysql-test/suite/innodb/r/innodb_bug56947.result
+++ /dev/null
@@ -1,17 +0,0 @@
-SET @save_fpt=@@GLOBAL.innodb_file_per_table;
-SET GLOBAL innodb_file_per_table=OFF;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-create table bug56947(a int not null) engine = innodb;
-SET @saved_dbug = @@SESSION.debug_dbug;
-SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
-alter table bug56947 add unique index (a);
-ERROR HY000: Got error 11 "xxx" from storage engine InnoDB
-check table bug56947;
-Table	Op	Msg_type	Msg_text
-test.bug56947	check	status	OK
-drop table bug56947;
-SET GLOBAL innodb_file_per_table=@save_fpt;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-SET debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/r/log_data_file_size.result b/mysql-test/suite/innodb/r/log_data_file_size.result
deleted file mode 100644
index ddb8e694e40..00000000000
--- a/mysql-test/suite/innodb/r/log_data_file_size.result
+++ /dev/null
@@ -1,12 +0,0 @@
-SET GLOBAL innodb_file_per_table=0;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-CREATE TABLE t(a INT)ENGINE=InnoDB;
-SET GLOBAL innodb_file_per_table=1;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-CREATE TABLE ibd4(a INT UNIQUE)ENGINE=InnoDB;
-CREATE TABLE ibd4f(a INT UNIQUE)ENGINE=InnoDB;
-CREATE TABLE ibd5(a INT UNIQUE, b INT UNIQUE)ENGINE=InnoDB;
-# Kill the server
-DROP TABLE t,ibd4,ibd4f,ibd5;
diff --git a/mysql-test/suite/innodb/r/row_format_redundant.result b/mysql-test/suite/innodb/r/row_format_redundant.result
index f0286381809..a99dde30655 100644
--- a/mysql-test/suite/innodb/r/row_format_redundant.result
+++ b/mysql-test/suite/innodb/r/row_format_redundant.result
@@ -13,9 +13,6 @@ insert into t values(456, 'abcdef', 'jghikl', 'mnop');
 insert into t values(789, 'abcdef', 'jghikl', 'mnop');
 insert into t values(134, 'kasdfsdsadf', 'adfjlasdkfjasd', 'adfsadflkasdasdfljasdf');
 insert into t1 select a,d,b,c from t, seq_1_to_1024;
-SET GLOBAL innodb_file_per_table=OFF;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
 create table t2 (a int not null, d varchar(15) not null, b
 varchar(198) not null, c char(156), fulltext ftsic(c)) engine=InnoDB
 row_format=redundant;
@@ -46,8 +43,6 @@ TRUNCATE TABLE t1;
 TRUNCATE TABLE t2;
 TRUNCATE TABLE t3;
 corrupted SYS_TABLES.MIX_LEN for test/t1
-corrupted SYS_TABLES.MIX_LEN for test/t2
-corrupted SYS_TABLES.MIX_LEN for test/t3
 # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/row_format_redundant --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/row_format_redundant --innodb-data-file-path=ibdata1:1M:autoextend --innodb-undo-tablespaces=0 --innodb-stats-persistent=0
 TRUNCATE TABLE t1;
 ERROR 42S02: Table 'test.t1' doesn't exist in engine
diff --git a/mysql-test/suite/innodb/t/alter_rename_existing.test b/mysql-test/suite/innodb/t/alter_rename_existing.test
index 556d8e660b4..7c458b3db5b 100644
--- a/mysql-test/suite/innodb/t/alter_rename_existing.test
+++ b/mysql-test/suite/innodb/t/alter_rename_existing.test
@@ -8,10 +8,7 @@
 
 --source include/have_innodb.inc
 
---disable_query_log
 LET $MYSQLD_DATADIR = `select @@datadir`;
-SET @old_innodb_file_per_table = @@innodb_file_per_table;
---enable_query_log
 
 CREATE TABLE t1 (a SERIAL, b CHAR(10)) ENGINE=Memory;
 INSERT INTO t1(b) VALUES('one'), ('two'), ('three');
@@ -39,45 +36,8 @@ SELECT * from t2;
 --error ER_ERROR_ON_RENAME
 ALTER TABLE t2 RENAME TO t1;
 
---echo #
---echo # Create another t1, but in the system tablespace.
---echo #
-SET GLOBAL innodb_file_per_table=OFF;
-CREATE TABLE t1 (a SERIAL, b CHAR(20)) ENGINE=InnoDB;
-INSERT INTO t1(b) VALUES('one'), ('two'), ('three');
-SHOW CREATE TABLE t1;
-SELECT name, space=0 FROM information_schema.innodb_sys_tables WHERE name = 'test/t1';
-
---echo #
---echo # ALTER TABLE from system tablespace to system tablespace
---echo #
-ALTER TABLE t1 ADD COLUMN c INT, ALGORITHM=INPLACE;
-ALTER TABLE t1 ADD COLUMN d INT, ALGORITHM=COPY;
-
---echo #
---echo # Try to move t1 from the system tablespace to a file-per-table
---echo # while a blocking t1.ibd file exists.
---echo #
-SET GLOBAL innodb_file_per_table=ON;
---replace_regex /#sql-ib[1-9][0-9]*/#sql-ib/
---error ER_TABLESPACE_EXISTS
-ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
---replace_regex  /Error on rename of '.*' to '.*'/Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME'/
---error ER_ERROR_ON_RENAME
-ALTER TABLE t1 FORCE, ALGORITHM=COPY;
-
---echo #
---echo # Delete the blocking file called MYSQLD_DATADIR/test/t1.ibd
 --remove_file $MYSQLD_DATADIR/test/t1.ibd
 
---echo # Move t1 to file-per-table using ALGORITHM=INPLACE with no blocking t1.ibd.
---echo #
-ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
-SHOW CREATE TABLE t1;
-SELECT name, space=0 FROM information_schema.innodb_sys_tables WHERE name = 'test/t1';
-
-DROP TABLE t1;
-
 --echo #
 --echo # Rename t2.ibd to t1.ibd.
 --echo #
@@ -89,5 +49,4 @@ DROP TABLE t1;
 
 --disable_query_log
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot rename '.*' to '.*' because the target file exists");
-SET GLOBAL innodb_file_per_table = @old_innodb_file_per_table;
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/default_row_format_compatibility.test b/mysql-test/suite/innodb/t/default_row_format_compatibility.test
index 5ebbe2003c7..660096ad3cc 100644
--- a/mysql-test/suite/innodb/t/default_row_format_compatibility.test
+++ b/mysql-test/suite/innodb/t/default_row_format_compatibility.test
@@ -17,9 +17,6 @@ SET GLOBAL innodb_default_row_format=Compact;
 # Check row_format=Compact
 SELECT @@innodb_default_row_format;
 
-# Check file_per_table=1
-SELECT @@innodb_file_per_table;
-
 CREATE TABLE tab(a INT) ENGINE=InnoDB;
 --replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 # 12 #
 SHOW TABLE STATUS LIKE 'tab';
diff --git a/mysql-test/suite/innodb/t/dropdb_cs.test b/mysql-test/suite/innodb/t/dropdb_cs.test
deleted file mode 100644
index 0053ca732be..00000000000
--- a/mysql-test/suite/innodb/t/dropdb_cs.test
+++ /dev/null
@@ -1,17 +0,0 @@
---source include/have_innodb.inc
---source include/have_case_sensitive_file_system.inc
-
---echo #
---echo # MDEV-28802 DROP DATABASE in InnoDB still is case-insensitive
---echo #
-
-SET @save_fpt=@@GLOBAL.innodb_file_per_table;
-SET GLOBAL innodb_file_per_table=0;
-CREATE DATABASE Db;
-CREATE TABLE Db.t1 (c1 INT KEY) ENGINE=InnoDB;
-CREATE DATABASE DB;
-DROP DATABASE DB;
-SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
-DROP DATABASE Db;
-SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
-SET GLOBAL innodb_file_per_table=@save_fpt;
diff --git a/mysql-test/suite/innodb/t/file_format_defaults.test b/mysql-test/suite/innodb/t/file_format_defaults.test
index f648610f47f..fcf4456ee89 100644
--- a/mysql-test/suite/innodb/t/file_format_defaults.test
+++ b/mysql-test/suite/innodb/t/file_format_defaults.test
@@ -10,8 +10,6 @@ call mtr.add_suppression("InnoDB: Cannot add field `c1` in table `test`\\.`tab0`
 # Check some default settings
 SELECT @@innodb_strict_mode;
 
-SELECT @@innodb_file_per_table;
-
 SET SQL_MODE=strict_all_tables;
 
 --disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.opt b/mysql-test/suite/innodb/t/innodb-autoinc.opt
index 303ec1be1d0..73362186d65 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc.opt
+++ b/mysql-test/suite/innodb/t/innodb-autoinc.opt
@@ -1,3 +1,2 @@
 --default-storage-engine=MyISAM
 --innodb-strict-mode=0
---innodb-file-per-table=0
diff --git a/mysql-test/suite/innodb/t/innodb-master.opt b/mysql-test/suite/innodb/t/innodb-master.opt
index 2e71d62206d..0815d24d67f 100644
--- a/mysql-test/suite/innodb/t/innodb-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-master.opt
@@ -1,6 +1,3 @@
 --binlog-cache-size=32768 --loose-innodb-lock-wait-timeout=1
 --default-storage-engine=MyISAM
 --innodb-strict-mode=0
---innodb-file-per-table=0
---loose-innodb-track-changed-pages
---loose-innodb-log-archive
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test
index c5c61ded651..0fe6df9839d 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test
@@ -98,8 +98,6 @@ if ($checksum_algorithm == "strict_full_crc32") {
 ALTER TABLE t2 IMPORT TABLESPACE;
 DROP TABLE t2;
 
-SELECT @@innodb_file_per_table;
-
 let MYSQLD_DATADIR =`SELECT @@datadir`;
 
 # Try importing when tablespace already exists
@@ -307,30 +305,9 @@ EOF
 DROP TABLE t1;
 
 #
-# Export/import on the same instance, with --innodb-file-per-table=0
-# This should fail because it is not supported
-SET GLOBAL innodb_file_per_table = 0;
-
-CREATE TABLE t1(
-	c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	c2 INT) ENGINE=InnoDB;
-
-INSERT INTO t1 SELECT seq,1 FROM seq_1_to_16;
-SHOW CREATE TABLE t1;
-
-# This should fail, InnoDB should return a warning
-FLUSH TABLES t1 FOR EXPORT;
-
-UNLOCK TABLES;
-
-DROP TABLE t1;
-
-#
 # Tests that check for schema mismatch during IMPORT
 #
 
-SET GLOBAL innodb_file_per_table = 1;
-
 CREATE TABLE t1(
 	c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	c2 INT, INDEX idx(c2)) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index 58e9899bd40..72ddc78614c 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -2429,7 +2429,11 @@ drop table t1;
 # I_S
 #
 create table t1 (id int) comment='this is a comment' engine=innodb;
-select table_comment, data_free > 0 as data_free_is_set
+# The newly created t1.ibd consists of only 4 pages
+# (no extra pages after the clustered index root page 3).
+# This test was applicable to tables that were created in the
+# InnoDB system tablespace (innodb_file_per_table=0).
+select table_comment, data_free
   from information_schema.tables
   where table_schema='test' and table_name = 't1';
 drop table t1;
diff --git a/mysql-test/suite/innodb/t/innodb_bug56947.test b/mysql-test/suite/innodb/t/innodb_bug56947.test
deleted file mode 100644
index 3e85e614812..00000000000
--- a/mysql-test/suite/innodb/t/innodb_bug56947.test
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Bug #56947 valgrind reports a memory leak in innodb-plugin.innodb-index
-#
--- source include/have_innodb.inc
--- source include/have_debug.inc
-
-SET @save_fpt=@@GLOBAL.innodb_file_per_table;
-SET GLOBAL innodb_file_per_table=OFF;
-create table bug56947(a int not null) engine = innodb;
-
-SET @saved_dbug = @@SESSION.debug_dbug;
-SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
---replace_regex /"[^"]*"/"xxx"/
---error ER_GET_ERRNO
-alter table bug56947 add unique index (a);
-check table bug56947;
-
-drop table bug56947;
-SET GLOBAL innodb_file_per_table=@save_fpt;
-SET debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/t/log_data_file_size.opt b/mysql-test/suite/innodb/t/log_data_file_size.opt
deleted file mode 100644
index 20e2cf0dc40..00000000000
--- a/mysql-test/suite/innodb/t/log_data_file_size.opt
+++ /dev/null
@@ -1,3 +0,0 @@
---loose-innodb-sys-indexes
---innodb-data-file-path=ibdata1:1M:autoextend
---innodb-undo-tablespaces=0
diff --git a/mysql-test/suite/innodb/t/log_data_file_size.test b/mysql-test/suite/innodb/t/log_data_file_size.test
deleted file mode 100644
index fe75b9ab236..00000000000
--- a/mysql-test/suite/innodb/t/log_data_file_size.test
+++ /dev/null
@@ -1,80 +0,0 @@
---source include/innodb_page_size.inc
---source include/not_embedded.inc
-
-let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
-let MYSQLD_DATADIR=`select @@datadir`;
-let MYSQLD_IS_DEBUG=`select version() like '%debug%'`;
---source include/no_checkpoint_start.inc
-SET GLOBAL innodb_file_per_table=0;
-CREATE TABLE t(a INT)ENGINE=InnoDB;
-let INNODB_ROOT_PAGE= `SELECT page_no FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE name='GEN_CLUST_INDEX'`;
-SET GLOBAL innodb_file_per_table=1;
-
-CREATE TABLE ibd4(a INT UNIQUE)ENGINE=InnoDB;
-CREATE TABLE ibd4f(a INT UNIQUE)ENGINE=InnoDB;
-CREATE TABLE ibd5(a INT UNIQUE, b INT UNIQUE)ENGINE=InnoDB;
-
-let $drop_tables= DROP TABLE t,ibd4,ibd4f,ibd5;
---let CLEANUP_IF_CHECKPOINT= $drop_tables;
---source ../include/no_checkpoint_end.inc
-
-perl;
-use Fcntl 'SEEK_CUR', 'SEEK_END';
-
-my $page_size = $ENV{'INNODB_PAGE_SIZE'};
-my $restart;
-open(FILE, "+<", "$ENV{'MYSQLD_DATADIR'}ibdata1") or die;
-if ($ENV{'MYSQLD_IS_DEBUG'})
-{
-  # It is impractical to ensure that CREATE TABLE t will extend ibdata1.
-  # We rely on innodb_system_tablespace_extend_debug=1
-  # to recover from this fault injection if no size change was redo-logged.
-  my $root = $ENV{'INNODB_ROOT_PAGE'};
-  my $size = sysseek(FILE, 0, SEEK_END) / $page_size;
-  seek(FILE, $page_size * ($root + 1), SEEK_SET) or die;
-  my $empty_tail= 1;
-  while(<FILE>) { unless (/\0*/gso) { $empty_tail= 0; last } }
-  if ($empty_tail)
-  {
-    $restart = "--innodb-data-file-size-debug=$size";
-    truncate(FILE, $page_size * $root);
-  }
-}
-# Clear the doublewrite buffer entries for our tables.
-sysseek(FILE, 6 * $page_size - 190, 0)||die "Unable to seek ibdata1\n";
-sysread(FILE, $_, 12) == 12||die "Unable to read TRX_SYS\n";
-my($magic,$d1,$d2)=unpack "NNN", $_;
-die "magic=$magic, $d1, $d2\n" unless $magic == 536853855 && $d2 >= $d1 + 64;
-sysseek(FILE, $d1 * $page_size, 0)||die "Unable to seek ibdata1\n";
-# Find the pages in the doublewrite buffer
-for (my $d = $d1; $d < $d2 + 64; $d++) {
-  sysread(FILE, $_, $page_size)==$page_size||die "Cannot read doublewrite\n";
-  my($space_id,$offset)=unpack "x[4]Nx[26]N",$_;
-  next unless $space_id && $offset > 3;
-  sysseek(FILE, $d * $page_size, 0)||die "Unable to seek ibdata1\n";
-  syswrite(FILE, chr(0) x $page_size)==$page_size||die;
-}
-close FILE;
-open(FILE, ">$ENV{MYSQLTEST_VARDIR}/log/start_mysqld.txt") || die;
-print FILE "--let \$restart_parameters=$restart\n" if $restart;
-print FILE "--let \$restart_noprint=2\n";
-print FILE "--source include/start_mysqld.inc\n";
-close FILE;
-open(FILE, "+<", "$ENV{'MYSQLD_DATADIR'}test/ibd4.ibd") or die;
-truncate(FILE, $page_size * 4);
-close FILE;
-open(FILE, "+<", "$ENV{'MYSQLD_DATADIR'}test/ibd4f.ibd") or die;
-truncate(FILE, $page_size * 4 + 1234);
-# Work around MDEV-12699 and ensure that the truncated page is all-zero.
-sysseek(FILE, $page_size * 4, 0);
-syswrite(FILE, chr(0) x 1234);
-close FILE;
-open(FILE, "+<", "$ENV{'MYSQLD_DATADIR'}test/ibd5.ibd") or die;
-truncate(FILE, $page_size * 5);
-close FILE;
-EOF
-
---source $MYSQLTEST_VARDIR/log/start_mysqld.txt
---remove_file $MYSQLTEST_VARDIR/log/start_mysqld.txt
-
-eval $drop_tables;
diff --git a/mysql-test/suite/innodb/t/row_format_redundant.test b/mysql-test/suite/innodb/t/row_format_redundant.test
index 6b5a559fc18..be2b884f2f8 100644
--- a/mysql-test/suite/innodb/t/row_format_redundant.test
+++ b/mysql-test/suite/innodb/t/row_format_redundant.test
@@ -44,7 +44,6 @@ insert into t values(134, 'kasdfsdsadf', 'adfjlasdkfjasd', 'adfsadflkasdasdfljas
 
 insert into t1 select a,d,b,c from t, seq_1_to_1024;
 
-SET GLOBAL innodb_file_per_table=OFF;
 create table t2 (a int not null, d varchar(15) not null, b
 varchar(198) not null, c char(156), fulltext ftsic(c)) engine=InnoDB
 row_format=redundant;
@@ -106,7 +105,7 @@ for (my $offset= 0x65; $offset;
     for (my $i= 0; $i < $n_fields; $i++) {
     	my $end= unpack("C", substr($page, $offset-7-$i, 1));
 	# Corrupt SYS_TABLES.MIX_LEN (ignored for ROW_FORMAT=REDUNDANT)
-	if ($i == 7 && $name =~ '^test/t[123]')
+	if ($i == 7 && $name =~ '^test/t1')
 	{
 	    print "corrupted SYS_TABLES.MIX_LEN for $name\n";
 	    substr($page,$offset+$start,$end-$start)= pack("N", 511);