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

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

2 files changed, 4 insertions, 84 deletions

diff --git a/mysql-test/main/partition_innodb_plugin.result b/mysql-test/main/partition_innodb_plugin.result
index 25b69212e5b..6d9f0765878 100644
--- a/mysql-test/main/partition_innodb_plugin.result
+++ b/mysql-test/main/partition_innodb_plugin.result
@@ -38,12 +38,8 @@ call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
 #
 # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
 #
-SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
 SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
-SET @@global.innodb_file_per_table = ON,
-@@global.innodb_strict_mode = ON;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
+SET @@global.innodb_strict_mode = ON;
 connect con1,localhost,root,,;
 CREATE TABLE t1 (id INT NOT NULL
 PRIMARY KEY,
@@ -63,53 +59,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=4
  PARTITION BY HASH (`id`)
 PARTITIONS 1
-SET GLOBAL innodb_file_per_table = OFF;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
-disconnect con1;
-connect con2,localhost,root,,;
-LOCK TABLE t1 WRITE;
-# ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
-# are incompatible with innodb_file_per_table = OFF;
-ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
-ERROR HY000: Got error 140 "Wrong create options" from storage engine InnoDB
-t1#P#p0.ibd
-t1.frm
-t1.par
-# This SET is not needed to reproduce the bug,
-# it is here just to make the test case more realistic
-SET innodb_strict_mode = OFF;
-ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
-t1.frm
-t1.par
-ALTER TABLE t1 REBUILD PARTITION p0;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
-UNLOCK TABLES;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` int(11) NOT NULL,
-  `user_num` char(10) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=4
- PARTITION BY HASH (`id`)
-PARTITIONS 3
 DROP TABLE t1;
-disconnect con2;
+disconnect con1;
 connection default;
 SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
-SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
-Warnings:
-Warning	1287	'@@innodb_file_per_table' is deprecated and will be removed in a future release
 SET @save_detect= @@GLOBAL.innodb_deadlock_detect;
 SET @save_report= @@GLOBAL.innodb_deadlock_report;
 SET GLOBAL innodb_deadlock_detect=ON;
diff --git a/mysql-test/main/partition_innodb_plugin.test b/mysql-test/main/partition_innodb_plugin.test
index c24945152b3..4b630c71393 100644
--- a/mysql-test/main/partition_innodb_plugin.test
+++ b/mysql-test/main/partition_innodb_plugin.test
@@ -37,10 +37,8 @@ call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
 --echo #
 --echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
 --echo #
-SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
 SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
-SET @@global.innodb_file_per_table = ON,
-@@global.innodb_strict_mode = ON;
+SET @@global.innodb_strict_mode = ON;
 --disable_query_log
 SET @save_innodb_read_only_compressed=@@GLOBAL.innodb_read_only_compressed;
 SET GLOBAL innodb_read_only_compressed=OFF;
@@ -57,42 +55,11 @@ PARTITION BY HASH(id) PARTITIONS 1;
 --replace_result #p# #P#
 --list_files $MYSQLD_DATADIR/test t1*
 SHOW CREATE TABLE t1;
-
-SET GLOBAL innodb_file_per_table = OFF;
-
---disconnect con1
---connect(con2,localhost,root,,)
-
-LOCK TABLE t1 WRITE;
-
---echo # ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
---echo # are incompatible with innodb_file_per_table = OFF;
-
---replace_regex / - .*//
---error ER_GET_ERRNO
-ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
-
---replace_result #p# #P#
---list_files $MYSQLD_DATADIR/test t1*
---echo # This SET is not needed to reproduce the bug,
---echo # it is here just to make the test case more realistic
-SET innodb_strict_mode = OFF;
-
-ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
---replace_result #p# #P#
---list_files $MYSQLD_DATADIR/test t1*
-
-# really bug#56172
-ALTER TABLE t1 REBUILD PARTITION p0;
-
-UNLOCK TABLES;
-SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
---disconnect con2
+--disconnect con1
 --connection default
 SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
-SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
 --disable_query_log
 SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
 --enable_query_log