diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-31 12:05:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-31 12:05:17 +0200 |
| commit | 377f4ec755c81ba49c7d27e510ac5a2acd74c688 (patch) | |
| tree | 62fc5164ed13a7c35260645de221c8f7e774f6a9 | |
| parent | 6252a281b5020d28685777c11ee27688a9db3d66 (diff) | |
| download | mariadb-git-bb-11.0-MDEV-29985.tar.gz | |
MDEV-29985 Remove the parameter innodb_file_per_tablebb-11.0-MDEV-29985
This follows up commit e581396b7aea94485580d2c9edaa9c5df647f2b7
(MDEV-29983), which deprecated the parameter.
83 files changed, 72 insertions, 1692 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index e0ea4a17ab8..124e704926e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1012,7 +1012,6 @@ enum options_xtrabackup OPT_INNODB_DATA_HOME_DIR, OPT_INNODB_ADAPTIVE_HASH_INDEX, OPT_INNODB_DOUBLEWRITE, - OPT_INNODB_FILE_PER_TABLE, OPT_INNODB_FLUSH_METHOD, OPT_INNODB_LOG_GROUP_HOME_DIR, OPT_INNODB_MAX_DIRTY_PAGES_PCT, @@ -1580,11 +1579,6 @@ struct my_option xb_server_options[] = "Number of background write I/O threads in InnoDB.", (G_PTR*) &innobase_write_io_threads, (G_PTR*) &innobase_write_io_threads, 0, GET_LONG, REQUIRED_ARG, 4, 1, 64, 0, 1, 0}, - {"innodb_file_per_table", OPT_INNODB_FILE_PER_TABLE, - "Stores each InnoDB table to an .ibd file in the database dir.", - (G_PTR*) &srv_file_per_table, - (G_PTR*) &srv_file_per_table, 0, GET_BOOL, NO_ARG, - FALSE, 0, 0, 0, 0, 0}, {"innodb_flush_method", OPT_INNODB_FLUSH_METHOD, "Ignored parameter with no effect", @@ -3355,7 +3349,7 @@ static void xb_fil_io_init() { - fil_system.create(srv_file_per_table ? 50000 : 5000); + fil_system.create(); fil_system.freeze_space_list = 1; fil_system.space_id_reuse_warned = true; } @@ -6854,12 +6848,6 @@ static int main_low(char** argv) incremental_lsn); } - if (xtrabackup_export && !srv_file_per_table) { - msg("mariabackup: auto-enabling --innodb-file-per-table due to " - "the --export option"); - srv_file_per_table = TRUE; - } - /* cannot execute both for now */ { int num = 0; 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 diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff b/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff index 421c962bd2e..94d38620645 100644 --- a/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff +++ b/mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff @@ -1,9 +1,7 @@ ---- innodb-remove-encryption.result 2022-09-02 20:44:59.960430396 +0530 -+++ innodb-remove-encryption,undo3.reject 2022-11-29 19:02:24.813094277 +0530 -@@ -13,6 +13,9 @@ +@@ -12,6 +12,9 @@ + innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME - innodb_system +innodb_undo001 +innodb_undo002 +innodb_undo003 @@ -21,9 +19,9 @@ mysql/innodb_table_stats mysql/transaction_registry @@ -36,6 +42,9 @@ + # restart: --skip-file-key-management --innodb-encrypt-tables=OFF --innodb-encryption-threads=0 --innodb-tablespaces-encryption SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME - innodb_system +innodb_undo001 +innodb_undo002 +innodb_undo003 diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption.result b/mysql-test/suite/encryption/r/innodb-remove-encryption.result index 22207f8184a..e8ab4145d9d 100644 --- a/mysql-test/suite/encryption/r/innodb-remove-encryption.result +++ b/mysql-test/suite/encryption/r/innodb-remove-encryption.result @@ -1,6 +1,3 @@ -set global innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release call mtr.add_suppression("(mysqld|mariadbd).*: 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 as a ENCRYPTION failed."); @@ -12,12 +9,13 @@ create table t1(a int not null primary key, b char(200)) engine=innodb; # Wait until encryption threads have encrypted all tablespaces SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME +innodb_system SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME -innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 # Success! SELECT * from t1; a b @@ -29,6 +27,7 @@ innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME # Success! @@ -37,12 +36,13 @@ NAME # restart: --skip-file-key-management --innodb-encrypt-tables=OFF --innodb-encryption-threads=0 --innodb-tablespaces-encryption SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; NAME -innodb_system mysql/innodb_index_stats mysql/innodb_table_stats mysql/transaction_registry +test/t1 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; NAME +innodb_system SELECT * from t1; a b DROP TABLE t1; diff --git a/mysql-test/suite/encryption/t/innodb-remove-encryption.test b/mysql-test/suite/encryption/t/innodb-remove-encryption.test index 8ff5fd632fd..718540b63b3 100644 --- a/mysql-test/suite/encryption/t/innodb-remove-encryption.test +++ b/mysql-test/suite/encryption/t/innodb-remove-encryption.test @@ -8,8 +8,6 @@ # MDEV-15566: System tablespace does not easily key rotate to unencrypted # -set global innodb_file_per_table=OFF; - call mtr.add_suppression("(mysqld|mariadbd).*: 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 as a ENCRYPTION failed."); 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); diff --git a/mysql-test/suite/innodb_fts/r/crash_recovery.result b/mysql-test/suite/innodb_fts/r/crash_recovery.result index 52a58c7034d..e8305cbb2f1 100644 --- a/mysql-test/suite/innodb_fts/r/crash_recovery.result +++ b/mysql-test/suite/innodb_fts/r/crash_recovery.result @@ -157,20 +157,5 @@ id title body 1 MySQL Tutorial DBMS stands for Database... 2 MariaDB Tutorial DB means Database ... DROP TABLE mdev19073, mdev19073_2; -# -# MDEV-28706 Redundant InnoDB table fails during alter -# -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 ( -col_int INTEGER, col_text TEXT, -col_text_1 TEXT -) ENGINE = InnoDB ROW_FORMAT = Redundant ; -ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ; -INSERT INTO t1 VALUES ( 1255, "mariadb", "InnoDB"); -# restart -ALTER TABLE t1 ADD FULLTEXT(col_text_1); -DROP TABLE t1; SELECT * FROM information_schema.innodb_sys_tables WHERE name LIKE 'test/%'; TABLE_ID NAME FLAG N_COLS SPACE ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result index cb615069067..6eba824b7fc 100644 --- a/mysql-test/suite/innodb_fts/r/fulltext.result +++ b/mysql-test/suite/innodb_fts/r/fulltext.result @@ -719,10 +719,6 @@ DROP TABLE t1; # # MDEV-25257 SEGV in fts_get_next_doc_id upon some INSERT # -SET @save = @@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 TABLE t1 ( col_int INTEGER, col_text TEXT, col_int_g INTEGER GENERATED ALWAYS AS (col_int) @@ -731,9 +727,6 @@ ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ; ALTER TABLE t1 DROP KEY `ftidx` ; INSERT INTO t1 (col_int, col_text) VALUES ( 1255, NULL); DROP TABLE t1; -SET @@global.innodb_file_per_table = @save; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release # # MDEV-20797 FULLTEXT search with apostrophe, # and mandatory words diff --git a/mysql-test/suite/innodb_fts/t/crash_recovery.test b/mysql-test/suite/innodb_fts/t/crash_recovery.test index cb53de4d595..9a0faeeef45 100644 --- a/mysql-test/suite/innodb_fts/t/crash_recovery.test +++ b/mysql-test/suite/innodb_fts/t/crash_recovery.test @@ -291,19 +291,4 @@ DROP TABLE mdev19073, mdev19073_2; let $shutdown_timeout=; ---echo # ---echo # MDEV-28706 Redundant InnoDB table fails during alter ---echo # - -SET @@global.innodb_file_per_table = 0; -CREATE TABLE t1 ( - col_int INTEGER, col_text TEXT, - col_text_1 TEXT -) ENGINE = InnoDB ROW_FORMAT = Redundant ; -ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ; -INSERT INTO t1 VALUES ( 1255, "mariadb", "InnoDB"); ---source include/restart_mysqld.inc -ALTER TABLE t1 ADD FULLTEXT(col_text_1); -DROP TABLE t1; - SELECT * FROM information_schema.innodb_sys_tables WHERE name LIKE 'test/%'; diff --git a/mysql-test/suite/innodb_fts/t/fulltext.test b/mysql-test/suite/innodb_fts/t/fulltext.test index 3ddc1856b7f..d63f78b6cda 100644 --- a/mysql-test/suite/innodb_fts/t/fulltext.test +++ b/mysql-test/suite/innodb_fts/t/fulltext.test @@ -746,8 +746,6 @@ DROP TABLE t1; --echo # --echo # MDEV-25257 SEGV in fts_get_next_doc_id upon some INSERT --echo # -SET @save = @@global.innodb_file_per_table; -SET @@global.innodb_file_per_table = 0; CREATE TABLE t1 ( col_int INTEGER, col_text TEXT, @@ -757,7 +755,6 @@ ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ; ALTER TABLE t1 DROP KEY `ftidx` ; INSERT INTO t1 (col_int, col_text) VALUES ( 1255, NULL); DROP TABLE t1; -SET @@global.innodb_file_per_table = @save; --echo # --echo # MDEV-20797 FULLTEXT search with apostrophe, diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result index 0d2b9c7cf2c..1a8095a5c5a 100644 --- a/mysql-test/suite/innodb_gis/r/rollback.result +++ b/mysql-test/suite/innodb_gis/r/rollback.result @@ -377,7 +377,6 @@ INSERT INTO t4 (c2, c1, c3, spatial_point) VALUES ('m', 'u', 'p', ST_GeomFromText('POINT(1192 1181)')); rollback; DROP TABLE t4; -SET GLOBAL innodb_file_per_table='on'; create table t1(i int primary key, a geometry not null, spatial index(a)) row_format=dynamic engine=innodb; insert into t1 values(1, st_geomfromtext(concat('multilinestring(','(-4286 -5983,52762 -5983,52762 79876,-4286 79876,-4286 -5983)',',','(-4286 -5983,52762 -5983,52762 79876,-4286 79876,-4286 -5983)',',','(-768 -136,-771 2864,-772 2860,-777 2862,-775 2858,-775 2863,-770 2866,-765 2871,-761 2874,-759 2878,-759 2883,-759 2886,-758 2886,-758 2886,-755 2890,-752 2890,-751 2890,1249 2890,1250 2892,1251 2892,1251 2892,1256 2897,1259 2894,1256 2899,1253 2904,1256 2904,1257 2906,1252 2910,1253 2910,1256 2912,1255 2913,1260 2911,1256 2913,1255 2918,1257 2921,1259 2925,1262 2922,1263 2923,1266 2926,1268 2929,1269 2932,1273 2937,1277 2942,1282 2942,1284 2939,1287 2935,1290 2935,1293 2938,1296 2940,1299 2942,1302 2947,1307 2952,1311 2956,1312 2958,1307 2956,1311 2955,1307 2956,1307 2960,1307 2962,1311 2965,1315 2967,1314 2968,1319 2969,1322 2973,1324 2978,1323 2977,1327 2982,1330 7982,1332 7985,1332 7986,1332 7988,1328 7991,1328 7991,1328 7991,1253 2910,1249 2908,1251 2908,1253 2913,1253 2909,1256 2914,1255 2916,1259 2919,1261 2923,1262 2923,1266 2925,1270 2930,1270 2932,1267 2929,1269 2929,1269 2931,1269 2926,1265 1926,1270 1926,1274 1926,1274 1929,1269 1929,1270 1931,1272 1935,1269 1935,1273 1938,1278 1938,1278 1938,1280 1943,1275 1948,1276 1951,1279 1948,1280 1952,1281 1952,1286 1954,1290 1958,1290 1963,1294 1964,1298 1962,1298 1958,1302 1963,1302 1967,1307 -2033,1311 -2030,1307 -2030,1310 -2025,1314 -2020,1317 -1020,1321 -1016,1321 -1018,1321 -1015,1326 -1016,1324 -1016,1327 -1011,1326 -1007,1326 -1002,1326 -1004,1321 -1004,1321 -1003,1324 -1008,1328 -1007,1328 -1003,1333 -999,1336 -998,1339 -997,1337 -996,1340 -2996,1335 -3000,1339 -2996,1343 -2995,1346 -2990,1341 -2990,1345 -2991,1345 -2995,1269 2931,1269 2936,1271 2941,1275 2941,6275 2943,6274 2943,6279 2939,6274 2942,6274 2946,6275 2947,6276 2948,6280 2947,6282 2951,6287 2952,6287 2956,6289 2959,6294 4959,6298 4964,6302 4965,6300 6965,6305 6965,11305 6967,11305 6967,11310 6966,11310 6966,11314 6964,11318 6969,11318 6972,11323 6974,11328 6977,11329 6979,11333 6982,11337 6982,11334 6982,11337 6983,11341 6988,11345 6991,11349 6992,11353 6993,11353 6996,11353 7000,11356 7000,11353 6000,11350 6002,11353 6004,11354 6007,11356 6009,11358 6009,11359 6011,11363 6016,11365 6013,11369 6015,11372 6017,11377 6022,11381 6025,11382 9025,11385 9029,11390 9024,11389 9020,11391 9020,11389 9016,11394 12016,11397 12021,11400 12021,11405 12024,11405 8024,11403 8029,11403 8032,11401 8033,11406 8032,11402 8027,11406 8027,11410 8029,11408 8030,11408 8035,11413 8035,11418 8038,11423 8038,11428 8036,11428 8037,11433 8033,11435 8032,6435 8035,6439 8036,6440 8034,6441 8039,6442 8043,6446 8045,6451 12045,6454 12050,6454 12049,6455 12054,6457 12057,6458 12060,6461 13060,6466 13060,6467 13065,6467 13070,6465 13073,6465 13073,6466 13077,6463 16077,6465 16081,6468 16077,6471 16077,6475 16078,6475 16080,6470 16082,6465 16084,6465 16088,6470 16091,6471 16091,6469 16089,6473 16091,6477 16091,6477 16093,6480 16098,6476 16099,6478 16099,6481 16100,6486 16105,6486 16110,6488 16105,6485 16107,6487 16108,6484 16104,6485 16101,6488 16101,6489 16103,6493 16105,6493 16108,6490 16110,6487 16113,6492 16116,6495 16118,6499 16123,6497 16124,6496 16127,6498 16132,6497 16134,6499 16138,6503 16143,6502 16138,6500 16140,6502 16144,6502 16146,6503 16150,6498 16151,6500 16154,6495 16154,6494 16154,6499 16156,7499 16158,7504 16161,7507 16166,7503 16163,7505 16163,7508 16163,7511 16165,7514 16162,7517 16165,7519 16166,7524 16165,7527 16168,7529 16172,7534 16172,7534 16177,7539 16179,7537 16179,7538 16184,7538 16185,7538 16189,7540 16191,7540 16193,7541 16193,7545 16197,7550 16199,7554 16204,7558 16208,7559 16211,7560 16214,7564 16216,7563 16215,7558 16219,7558 16216,7555 16221,7559 16223,7559 16224,7559 16226,7561 16231,7558 16235,7553 16240,7552 16236,7557 16234,7552 16236,7554 16238,7557 16239,7552 16243,7553 16243,7555 16243,7555 14243,7558 14248,7559 14243,7559 14239,7561 14241,7561 14243,7561 14248,7562 14250,7566 14254,7570 14254,7575 14256,7575 14259,7576 14259,7579 14259,7583 14257,7583 14257,7583 14253,7584 14249,7579 14247,7576 14245,7579 14250,7577 14253,7582 14256,7582 14257,7578 14253,7575 14252,7577 14255,7578 14255,7578 14256,7581 14257,7584 14252,7588 14252,7592 14249,7592 18249,7588 18253,7590 18255,7592 18259,7596 18254,7601 18255,7601 17255,7605 17256,7610 17258,7613 17261,7617 17262,7619 17266,7617 17267,7621 17268,7623 17272,7626 17272,7626 17277,7625 17282,7620 17281,7617 17284,7618 17287,7617 17283,7616 17281,7621 17279,7624 17281,7624 17282,7624 17279,7628 17279,7628 17280,7633 17284,7637 17280,7638 17280,7638 17281,7641 17282,7641 17282,7638 17283,7638 17284,7643 17280,7647 17281,7652 17285,7656 17285,7658 17288,7660 17290,7661 17292,7664 17297,7666 17302,7663 17304,7664 17300,7659 17303,7661 17303,7657 17307,7659 17307,8659 17310,8661 17313,8664 17314,8665 17313,8665 17309,8669 17313,8671 17316,8670 17320,8668 17320,3668 17323,3665 17324,3661 17329,3661 17331,1661 17332,1661 17333,1663 17338,1668 17333,1663 17333,1667 17331,1668 17331,1664 17334,1666 17337,1665 17337,6499 16138,6503 18138,10503 18142,10503 18142,10505 21142,10502 21144,10502 21142,10504 21141,10504 21139,10508 21140,10512 21141,10512 21143,10515 21144,10517 21147,10517 21143,10519 21143,10519 21146,10519 21142,10519 21142,10522 21141,10523 21141,10523 21145,10523 21149,10527 21153,10531 21154,10534 21158,10531 21158,10527 21160,10532 21165,10534 21165,10531 21165,10533 21162,10529 21163,10532 21160,10534 21163,10535 21161,10540 25161,10538 25164,10538 25166,10540 25171,10543 25171,10547 25175,10547 25175,10550 25178,10552 25182,10556 25177,10558 25181,10558 25183,10563 25187,10564 25183,10560 25188,10565 25188,10569 25191,10573 25195,10575 25199,7581 14257,7585 14257,7586 14257,7588 14254,7590 14255,7593 14256,7590 14260,7595 14263,7595 14259,7597 14256,7598 14261,7598 14258,7599 14261,7600 14261,7602 14258,7602 14258,7598 14259,7598 14264,7600 14267,7601 17267,7597 17268,7602 17273,7605 17276,7605 17276,7603 17279,7604 17279,7608 17278,7613 17282,7615 17285,7617 17288,2617 17288,2617 17289,2620 17289,2620 17285,-1380 17288,-1382 17287,-1384 17292,-1384 17294,-1380 17295,-1380 17297,-1380 17299,-1375 17303,-1372 17303,-1373 17298,-1368 13298,-1365 13301,-1366 13297,-1371 13295,-1371 13298,-1371 13298,-1375 13301,-1378 13302,-1378 13302,-1377 13302,-1374 13301,-1373 13306,-1370 13311,-1371 13307,-1366 13307,-1365 13309,11349 6992,11352 6992,11354 6997,11356 7002,11356 7007,11359 7010,11354 7005,9354 7009,9356 7011,9359 7016,9360 7014,9360 7015,9363 8015,9367 11015,9370 11012,9367 11012,9368 11016,9363 11017,9360 11018,9364 11021,9359 11016,11402 8027,11399 8029,11400 8033,11401 8034,11405 8029,11407 8027,11410 8029,12410 8033,12414 8035,12412 8040,12415 8040,12416 8045,12421 8042,12426 8037,12424 8042,12427 8042,12430 8044,12434 8046,12430 8048,12434 8045,9434 8045,9439 8043,9442 8043,9442 8045,9442 8040,9442 8035,9438 8038,9440 8039,9445 8036,9446 8039,9441 8043,12441 8047,12440 8048,12444 8052,12445 8057,12450 8053,12452 8053,12448 8054,12443 8058,12441 8063,12444 8067,12449 8067,12448 8071,12451 8076,12454 8073,17454 8073,17457 8074,17459 8079,17463 8079,17461 8080,17464 4080,17467 4085,17463 4085,17463 4088,17462 4090,17464 4095,17468 4094,17464 4097,17464 4093,17466 4088,17469 4092,17470 4094,17472 4089,17470 4090,17473 4089,17478 4094,17474 4091,17477 4095,17482 4100,17487 4103,17492 4101,17492 4104,17493 4101,17495 4106,17497 4106,17502 4111,17505 4111,17504 4113,17505 4115,17509 4119,17504 4123,17505 4127,17503 4131,17503 4126,17504 4126,17506 4129,17501 4132,17502 4133,17499 4133,17503 5133,17503 5135,17498 5134,21498 5134,21498 5131,21498 5133,21497 5138,21501 5140,21502 5138,21502 5141,21505 5136,21501 5139,21501 5141,21505 5146,21510 5151,21510 5155,21512 5156,21508 5159,21508 5163,21512 5167,21517 5169,21521 5173,21519 5172,21517 5172,21515 5172,21515 5173,21516 5172,21515 5169,21516 5170,21516 5170,21516 5168,21520 5172,21523 5172,21525 5174,21522 5176,21523 5180,21527 5176,21527 5177,21527 5178,21531 5183,21533 5181,21538 5176,21539 5179,21544 9179,21544 9184,21547 9186,21548 9184,21553 9188,21553 9193,21554 9195,21556 9200,21556 9201,21555 9201,21556 9205,21561 9205,21556 9202,21561 9203,22561 9204,22566 9204,22561 9208,22559 9210,22564 9207,22560 9205,22560 9208,22564 9210,22567 9214,22569 9218,22572 9222,22576 9218,23576 9222,24576 9220,24574 9224,24569 9228,24569 9228,6481 16100,6483 16101,6486 16104,6485 16108,8485 16110,8486 16115,8482 16110,8483 16115,8485 16110,8486 16106,8487 16103,8490 16106,8486 16107,8487 16104,8487 16104,8492 16108,8493 17108,8488 17108,8490 17110,8494 17114,8495 17113,8495 17117,8498 17117,8503 17122,8498 17124,8498 17128,8494 17129,8496 17134,8496 17134,8497 17135,8498 17135,8501 17135,8502 17132,8506 17132,8501 17130,8505 17131,21515 5169,21518 5164,21523 5160,21528 5162,21530 8162,21532 8164,21536 8165,21536 8168,21540 8169,21543 8165,25543 8169,25545 8173,25549 8169,29549 8174,29546 8177,29547 8172,29552 8177,29552 8180,29557 8180,29558 8175,34558 8180,34558 8176,34555 8179,34556 8181,7584 14249,7586 14250,7588 14252,7591 14256,7587 14257,7590 14257,7592 17257,7597 17261,7601 17265,7605 17268,7606 17273,7610 17268,7612 17270,7612 17271,7615 17266,7617 17266,7622 17270,7627 17272,7627 19272,7631 19277,7636 19279,7636 19280,7636 19285,7637 19287,7639 19290,7644 19295,7647 19291,7649 19296,7653 19296,7653 19291,7656 19292,7657 19292,7653 19292,7653 19297,7652 19297,7648 19299,7647 19303,7647 19304,7649 19307,7654 19309,7651 21309,7653 21309,7657 21313,7659 21309,7662 21310,7666 21314,7663 21314,7663 21317,7658 21317,7661 21321,7666 21323,7667 21328,7662 21333,7663 21328,7667 21332,7669 21334,7671 21330,7674 21326,7675 21331,7679 21336,7681 21338,7681 21342,7681 21342,7677 21345,7682 21346,3682 21348,3680 21350,3681 21351,3680 21349,3681 21349,3686 21350,8686 21355,8682 21354,8685 21350,8681 21345,8684 21350,8683 21353,8681 21356,8681 21358,8684 21361,8684 21364,8684 21367,8685 21363,8685 21365,8685 21362,8688 21358,8690 21359,8687 21364,8687 21364,8689 21361,8691 21356,8696 21353,8696 21352,8699 21352,8699 21357,8703 21358,8706 21353,8708 21358,17503 4126,17505 4129,20505 4133,20510 4133,20515 4128,21515 4129,21516 9129,21519 9131,21524 9134,21522 9135,21522 9138,21518 9137,21516 9138,21516 9138,21515 12138,21516 12142,21518 12146,21513 12144,21517 12149,21521 12144,21521 12148,21523 12151,21527 12148,21527 12143,21528 12148,21528 12145,21533 12149,21534 12152,21537 12155,21532 7155,21536 7153,21540 7157,21536 7154,21540 7154,21539 7157,21539 7160,21542 7160,21547 7164,21551 7168,21554 9168,21556 9168,21556 9169,21559 9166,21561 9169,21565 9171,21568 9176,21565 9181,21567 9180,23567 9178,23570 9181,23575 9181,23571 9181,20571 9176,20574 9179,20569 9182,20569 9184,20570 9189,20565 9191,20562 9195,20559 9196,20559 9201,20563 9197,20564 9193,20565 9197,20565 9200,20565 9200,20563 9201,20559 9205,20564 13205,20560 13207,20560 13212,20555 13213,20558 13217,20554 13217,20558 13219,20559 13222,20561 13223,20561 13226,20561 13231,20562 13232,20567 13235,20564 13239,20560 13239,20560 13236,20560 13236,20560 13237,20564 13241,24564 13241,28564 13242,28564 13240,28561 13237,28561 13240,28562 13243,28563 13243,28560 13248,28559 13248,28559 9248,28562 9245,28564 9241,28567 9245,28568 9240,28568 9245,28571 9247,28571 9248,28574 9253,28572 9256,28576 9257,28577 9257,28574 9257,10564 25183,10566 25188,10567 25190,10568 25186,10569 25187,10570 25188,10573 25185,10568 25185,10570 25187,10573 25191,10573 25193,10578 25193,10578 25198,10581 25202,10582 25206,10578 25206,10579 25211,10580 25206,10582 25208,12426 8037,12427 8042,12432 8047,12437 8047,12435 8051,12435 9051,12432 9054,12433 9056,12435 9061,12438 9062,12435 9062,12438 9067,12434 9071,12431 9075,12436 11075,12436 11075,12441 11080,12445 11085,12449 11089,12445 11091,12442 11091,12442 11093,12442 11093,12443 11098,12439 11098,12440 11099,7440 11104,7442 11107,7446 11110,7446 11114,7451 6114,7452 6110,11452 6105,11452 6104,11454 6103,11459 6106,11462 6107,13462 6107,13458 6104,12458 9104,17458 9109,17458 9110,17460 9113,17465 12113,17468 12112,17468 12114,17466 12111,17470 12116,17469 12119,17472 12123,17470 12118,17474 12118,17476 12120,13476 12121,13480 17121,13480 17125,13484 17123,13489 17122,13489 17125,13487 17127,13487 17132,13486 17131,13491 17136,13491 17139,13495 17144,13496 17147,13496 21147,13498 21149,13498 21154,16498 21159,16503 21162,16504 26162,16509 26160,16509 26163,16509 26162,16514 26159,16518 26163,16522 26158,16518 30158,16516 30161,16516 30164,16517 30169,16520 30167,16525 30168,16528 30170,17528 30170,17532 30175,17533 30177,17533 30182,17536 30186,17537 30189,17540 30193,20540 30193,20541 30196,20541 30197,20542 30196,20544 30195,20548 30200,20553 30199,20557 30201,20561 30206,20565 30210,20566 30209,20568 30214,20568 30217,20563 30217,20563 30218,20565 30222,20567 30222,20572 30225,20567 29225,20570 29225,20570 29230,20573 29231,20571 29230,20569 29232,20570 29236,17504 4123,17505 4127,17508 5127,17505 5131,17505 5135,17509 5140,17508 5142,17510 5139,17515 5141,17517 5144,17522 5144,17524 5146,17529 5147,17529 5152,17533 8152,17533 8150,17537 8153,17532 8158,17533 11158,17536 11163,17540 16163,17540 16165,17542 16168,17542 16171,17542 16171,17547 16167,17548 16170,17550 16170,17545 16175,17549 16178,17549 16179,17549 16179,20549 16181,20551 16186,20549 15186,20550 15186,20547 15188,20550 15184,20546 15186,20545 15191,20548 15190,20552 15193,20557 15195,20552 15196,20557 15193,20562 15196,20562 15199,20567 15202,20563 15207,20564 15207,20564 15209,20568 15209,20571 13209,20573 13209,20576 13211,20577 13216,20574 14216,20570 14215,20568 17215,20568 17216,20570 17218,20575 17218,20580 16218,20583 16215,20586 16217,20581 16220,20582 16224,20585 16224,20588 16229,20590 16231,20592 16235,20595 16232,20595 16234,20598 16238,20603 16240,20607 16236,20608 16236,20608 16239,20611 21239,20613 21244,20614 21246,20612 21244,20612 21242,20615 21239,20616 21241,20621 21242,17621 21244,17626 21245,17629 21244,15629 21239,15632 21240,15636 21245,15637 21247,15639 21244,15637 21245,15642 21245,15647 21244,15646 21248,15650 21252,15653 21247,15651 21250,15649 21250,15645 21250,19645 21253,19648 21256,19647 21253,19643 21249,19646 21249,19648 21245,19650 21242,19647 21240,19652 21240,14652 21240,14657 21243,14659 21244,14664 21241,14659 21239,14654 21240,14651 21244,14647 21246,14647 21249,14650 21247,14651 21252,14651 21255,14649 21258,14652 21262,14655 21262,14652 21260,14653 21255,14653 21255,14653 21257,14656 21258,14651 21258,14653 21261,14654 21263,14654 21264,14659 21267,14660 21263,14664 21264,14666 26264,14661 26266,14661 26263,14661 26264,14666 26265,14667 26265,14665 26263,14669 26263,14667 26263,14669 26261,14667 26263,14671 26261,14671 26263,12671 26264,12672 26266,12677 26269,17677 26269,17673 26271,17676 26271,17676 26273,17681 26278,17685 26278,21536 8168,21539 8171,21543 8169,21538 8170,21541 8170,21544 8171,21548 8166,21548 8168,21552 8171,21555 8173,21558 8168,21557 8168,21562 8163,21559 8168,21559 8172,21564 8177,21569 8175,21568 8175,21573 8178,21575 8180,21570 8183,21570 8186,21566 8184,21569 8185,21569 8187,25569 8190,25571 8193,25575 8193,25576 8194,25576 13194,25580 13194,25584 13196,25589 13197,25592 13200,25595 13205,25592 17205,25593 17209,25594 17213,27594 17209,27592 17213,27590 17212,27592 17217,27592 17220,27596 17224,27599 17227,27603 17232,27603 17227,27605 17229,28605 17230,28607 17234,28609 17230,28610 17231,28610 17236,28611 17238,28613 17241,28614 17241,28615 17243,28616 18243,28618 18246,28618 18246,28622 18246,28627 18246,28632 18245,27632 18245,27634 18245,27633 18244,27638 18245,-1366 13297,-1365 13299,-1362 13303,-1362 13300,-1361 13304,-1366 13308,-1368 13304,-1368 13306,-1367 13309,-1363 13313,-1358 13313,-1353 13318,-1351 13319,-1347 13323,-1343 13318,-1343 13322,-1340 13317,-1337 13318,-1337 13322,-1337 13324,-1335 13327,-1339 13328,-339 13328,-334 13333,-331 13336,-327 13338,-326 13340,-326 13342,-321 13340,-318 13343,-317 11343,-312 11345,-307 11349,-311 11353,-314 11350,-311 11353,-313 11349,-308 11352,-313 11347,-308 11351,-306 9351,-306 9351,-306 9351,-301 9355,-301 9356,-299 9359,-297 9355,-297 9354,-296 9359,-294 9364,-290 9360,-294 9355,-289 9357,-291 9353,-286 9355,-4286 9351,-4283 9347,-4281 9344,-4281 9344,-4280 9342,-4280 9342,-4280 9339,-4277 9335,-4274 9333,-4274 9335,-4269 9336,-4265 9339,-4260 9340,-4256 9339,-4251 9336,-4251 9339,-4249 9344,-4254 9344,-4255 9348,-4253 7348,-4251 7352,-4247 7354,-4243 7357,-4242 7357,-4240 7362,-4240 7367,-4235 7371,-3235 7371,-3230 7376,-3225 7375,-3221 7372,-3223 7369,-3223 7371,-3223 7369,-3225 7364,-3220 7364,-3218 11364,-3218 11368,-3215 11369,-3210 11372,-3210 11369,-3208 11373,-3207 11377,-3207 11381,-3209 11384,-3209 11383,-1209 11379,-1211 11383,-1209 11383,-1205 11379,-1200 11384,-1197 11379,-1195 11375,-1197 11376,-1192 11377,-1192 11379,-1192 11384,-1188 11382,-1186 11382,-1181 11384,-1180 11388,-1176 11389,-1171 11388,-1171 11393,-1169 11393,-1164 11398,-1162 11393,-1158 11392,-1155 11395,-1155 11397,-155 16397,-156 16401,-156 16406,-158 16409,-158 16412,-158 16414,-160 16415,-158 20415,2842 20411,2847 20413,2848 20417,2848 20417,2848 20412,2850 20407,2850 20403,2846 20408,2847 20406,2849 20406,2854 20402,2858 20403,2863 23403,2858 23402,2855 23405,2858 23400,2857 23400,2852 26400,2849 26404,2850 26406,2855 26410,2859 26415,2863 26411,2866 26411,2866 26411,2866 26412,2868 26415,2868 26419,2868 26423,2873 26424,2876 26425,14656 21258,14661 21260,14664 21262,14664 22262,14662 22267,14662 22268,14662 22268,14658 22273,14660 22278,14658 22277,14659 22278,14660 22283,14661 22281,14661 22285,14661 22288,14664 22290,14659 22295,14662 22298,14663 22301,14667 22301,14668 22301,14673 22303,14678 22306,14681 22302,14686 22299,14686 22301,14683 22304,14686 22305,14687 22301,14689 25301,14684 25301,14684 25299,14685 25300,14685 25301,14685 24301,14688 24301,14693 24303,14693 24298,14693 24298,14688 24299,14689 24297,14690 24299,14690 24302,14690 24302,14686 24303,14686 24306,14688 24302,8492 16108,8494 16113,8498 16116,8495 16116,8496 16116,8499 16116,8504 20116,8508 20119,8508 20119,8507 20119,8509 20123,8509 20127,8512 20128,8514 20130,8519 20135,8522 20136,8522 20136,8524 20138,8524 20141,8528 20142,8526 20145,8530 20141,8530 20145,8532 20149,8531 20151,8536 20155,8535 20154,8539 20154,8539 20149,8539 20149,8543 20146,8540 25146,8538 23146,8540 23149,8540 23149,8545 23151,8546 23152,8551 23152,8555 23152,8559 23153,8561 23153,10561 18153,10561 18153,12561 18158,12564 18159,12566 18163,12567 18165,12564 18165,12568 20165,12570 20170,12575 20173,12579 20177,12576 20177,12579 20176,12584 20176,12583 20181,12585 20182,12583 20186,12582 20187,12585 20192,12582 20194,12584 20198,12586 20198,12581 20201,12582 20204,12581 20206,13581 20209,13586 20211,13586 20216,13589 20217,13589 20213,13586 20215,13588 20213,13592 20215,13596 20216,13596 20221,13600 20221,13598 20224,13595 20221,13598 20226,13602 20229,15602 20232,15606 20232,15611 20232,15610 20232,15613 20235,15617 20239,15612 20234,15612 20233,15615 20237,15617 20233,15619 20234,15619 20229,15623 25229,15624 25229,20624 25228,20628 25229,20631 25234,20630 25239,20634 25241,20632 25244,20636 25240,20634 25237,20639 25236,20634 25241,7590 14257,7592 14260,7592 14262,7592 14265,7595 14266,7600 14263,7600 14268,7604 14270,7609 14274,7611 14275,7615 14275,7620 14277,7620 14276,7625 14277,7625 14277,7628 14281,7628 14286,7630 14284,7630 14284,8543 20146,8542 20148,8546 20150,8550 20152,8550 20153,8550 20158,8545 20156,8545 20157,8550 20157,8550 20155,8550 20157,8553 20161,8557 20161,8557 20165,8560 20161,8563 20159,8568 20154,8570 20158,8573 20161,8573 20166,8577 20168,8580 20171,8584 20173,8585 20175,8580 20180,8582 20183,8582 20188,8582 20188,8585 20193,8588 20198,8589 20199,8591 20197,8594 20198,8596 20196,8592 23196,8597 25196,8601 25199,8601 25203,8604 25202,8604 25202,8599 25205,8601 25210,8601 25206,8603 25206,8606 25206,8605 25211,8609 25211,8613 25208,8614 25205,8619 25208,8619 25210,8621 25214,8619 29214,8615 29218,8616 29219,8617 29217,8622 29222,11622 29225,11624 29229,11623 29230,9623 29225,9621 29224,9625 29227,9628 29227,9624 29232,9626 29237,9631 29241,9634 29245,9635 29248,9638 29253,9643 29258,9646 29258,9647 29255,9648 29253,9650 29258,9648 29262,9647 29262,9642 29267,9646 29267,14646 29269,14650 29274,14655 29279,14654 29277,14655 29275,14653 29276,14655 29273,14656 29269,14653 29272,14656 29272,14656 29274,14660 29276,14663 29276,14660 29278,14659 29281,14659 29276,14661 29272,14656 29273,14657 29274,14652 29270,14654 29274,14657 29270,14659 29272,14655 29275,14657 29270,14659 32270,14660 32270,14662 32273,14665 32277,12665 32279,12670 32279,12670 32277,12670 32274,12672 32277,12677 32282,12682 32285,12678 32289,12674 32291,12677 32287,12679 32287,12683 32292,12685 32292,12680 32289,12682 32294,12683 32299,12687 32298,12692 32300,12695 32305,12699 32310,12703 32311,12704 32312,21515 5172,21516 5175,21518 5175,21513 5177,21516 5182,21520 5186,21525 5185,21529 5185,21528 5186,21530 5181,21533 5178,21537 5183,21537 5183,26537 5183,26534 5183,26539 5183,26542 5178,26542 5176,26544 5176,26546 5177,26548 5175,26549 5178,26548 5181,26548 5184,26553 10184,26557 10179,26559 10175,26563 10171,26563 10173,26564 10170,26568 10169,26572 10171,26577 10171,26581 10169,26577 10173,26573 10169,26575 10171,26578 12171,26576 12175,26576 12180,26581 12183,26577 12183,26580 12184,26582 12181,26582 12182,26583 12182,26588 12186,26590 12191,26593 12193,26593 12198,26598 12198,26602 12193,26602 12193,26604 12195,26607 12195,26611 12196,26615 12196,26615 12200,21534 12152,21534 12152,21537 12147,21540 12147,21545 12150,21545 12145,21548 12150,21549 12152,21544 12152,21544 12150,21547 12153,21552 12152,21553 12157,20553 12161,20553 12156,20556 12152,15556 12157,15559 12160,15557 12163,15561 12163,15564 12166,15565 12165,15561 12161,15559 12163,15559 12168,-4274 9335,-4274 9339,-4276 9341,-4276 9344,-4273 9341,-4271 9341,-4266 9342,-4266 9339,-4269 9335,-4265 9339,-4263 9342,-4259 9345,-4254 9345,-4250 9340,-4250 9335,-4245 9338,-4242 9341,-4240 9341,-3240 9346,-3242 9349,-3241 9351,-3239 9352,-3238 9355,-3237 9358,-3233 9356,-3232 9358,-3233 9358,-3228 9363,-3228 9364,-3223 9369,-3226 9369,-3224 9373,-3222 9378,-3217 9379,-3215 9384,-3215 9384,-3215 9389,-3215 9394,-3215 9390,-3210 9385,-210 9386,-207 9389,-208 9389,1328 -1007,1328 -1010,1329 -1013,1334 -1018,1339 -1013,1344 -1013,1346 -1013,1350 -1015,1351 -2015,1353 -2016,1353 -2011,1350 -2016,1350 -2013,1354 -2010,1356 -2005,1359 -2007,1364 -2005,1363 -2005,1365 -2000,1362 -1999,1365 -1998,1366 -1998,1362 -1994,1364 -1989,1365 -1988,3668 17323,3665 17327,3663 17332,3666 17337,3667 17341,11433 8033,11434 8035,11434 8031,11437 8031,11437 8032,11441 8033,11439 8033,11442 8036,11445 8037,11448 8038,11452 8043,11454 8047,11456 8047,11459 8044,11454 8049,11457 8051,11460 8052,11463 8055,11458 8057,1346 -2990,1346 -2986,1350 -2982,1347 -2986,1352 -2983,1352 -5983,1355 -5979,1358 -5974,1354 -5970,1356 -5965,1360 -5964,1362 -5960,1364 -5960,1364 -5960,1369 -5960,1364 -5963,1369 -5960,1374 -5957,1378 -5952,1380 -5951,1384 -5951,1380 -5948,1380 -5944,1384 -5942,1387 -5945,5387 -5949,5391 -5950,5395 -5950,5395 -5951,5395 -5949,5400 -5954,5404 -5953,5402 -5958,7402 -5958,7403 -5963,7404 -5960,7404 -5959,11363 6016,11359 6018,11364 6023,11365 6024,11365 6023,11369 6025,11373 6020,11378 6020,11377 6024,11379 6029,11383 6033,11384 6034,11388 6037,11389 6041,11394 6043,11396 6048,11401 6048,11402 6050,11406 6052,11404 6054,11409 6058,11413 6059,11415 6060,11411 6065,11416 6068,11420 6073,11415 6076,11416 6078,11419 6083,11423 6085,11428 6086,11430 6086,11432 11086,11437 11091,11432 11088,11429 11086,11432 11086,11427 11090,11427 11095,11429 11092,11427 11092,11431 11087,11433 11088,11436 11090,11436 11091,11436 11096,11439 11099,11440 11099,11440 11095,11445 11097,15445 11102,15445 11102,15441 11099,15445 11100,15445 11102,15443 11106,15445 11110,15450 11107,15453 11110,15457 11110,15457 11115,15459 11119,15460 11117,15465 11117,15465 11120,15464 11123,15463 11124,15460 11124,15460 16124,15458 16127,15462 16122,15466 16126,15462 16131,15465 16133,15463 16135,15462 16136,15462 16140,15466 16142,15468 16147,15468 16147,15471 16149,15471 16147,15475 12147,15477 12150,15480 12147,15484 12144,15487 12145,15490 12147,15492 12149,15494 12150,15496 12153,15497 12155,15499 12150,15499 12147,15500 12143,15504 12146,15499 12150,15500 12150,15500 12152,15505 12153,15506 12157,15506 12157,15508 12158,15512 12159,19512 12162,19513 12159,19511 12163,19512 12162,19517 12167,19520 12167,19522 12168,19525 12171,19525 12172,19525 12175,19526 12172,19526 12172,19526 17172,19527 17175,19528 17176,19529 17179,19529 17178,19533 17181,19532 17183,19532 17179,19537 17174,19539 19174,19538 19171,19542 19172,19547 15172,7641 17282,7646 17284,7649 17284,7652 17284,7654 17285,7650 17289,7647 17291,7645 17296,7649 17297,7650 17294,7653 17294,7653 17298,7656 17303,7658 17308,7662 17313,7666 17308,7664 17313,7669 17313,7669 17313,7669 17316,7667 17313,7667 18313,7663 18314,7661 18316,7662 18317,7657 18318,7662 18315,7658 18316,7661 18318,7661 18322,7664 18317,7667 18315,7671 18315,7675 18315,7674 18315,7670 18316,11670 18316,16670 18321,16673 18321,16678 18322,16682 18327,16683 18332,16686 18334,16690 18334,16688 18336,16685 23336,16688 23337,14688 23338,14692 23337,14694 23338,14697 23339,14697 23342,14698 23342,14698 23343,14698 23348,14693 23350,14694 23347,14695 23347,14696 26347,14692 23347,14692 23347,14693 23350,14693 23351,14698 23355,18698 23352,18698 23356,18702 23360,18701 23362,18699 23363,18701 23363,18702 23366,18699 23366,18694 23370,18699 23370,18702 23374,18707 23378,18706 23380,18706 23381,22706 23384,22706 23385,22705 23389,22706 23384,22706 23384,22706 23384,22710 23380,22713 23381,22718 23386,22716 23390,22712 23390,22708 23390,22705 23392,22704 23397,25704 23402,25704 23402,25706 23404,25710 23404,22710 18404,22707 18402,22704 18403,22704 18406,22704 18411,22704 18411,22704 18410,22709 18410,22709 18407,22704 18405,22703 18405,22707 18405,20707 18409,20709 18412,20710 18411,20712 18414,20712 18414,20712 18412,20712 18416,20714 18412,20717 18417,20720 18419,20715 18421,20718 18422,20723 18425,20723 18430,20723 18434,20725 18435,20724 18437,20724 18433,20726 18433,20731 18437,20732 18437,20730 18438,20735 18440,20739 18438,20734 18438,20739 18437,20739 18437,20744 18439,20749 18438,20750 18434,20753 18436,20754 18431,20754 18432,20758 18433,20762 18438,20764 18443,20766 18447,20766 18450,20767 18451,20768 18451,20769 18448,20770 18452,20774 18456,20777 18458,20781 18462,20782 18463,20785 18468,17785 21468,17784 21473,17782 21477,17787 21481,17783 21482,17785 26482,17788 26482,17788 26482,17791 26479,17794 26483,17790 26483,22790 26483,22790 26479,20583 16215,20585 16220,20589 16225,20590 20225,20592 20222,23592 20227,22592 20229,22597 20233,22600 20233,22603 20237,22604 20240,22599 20241,22595 18241,22595 18242,22598 18243,22602 18247,22605 18252,22601 18256,22598 18255,22600 18257,22604 18258,22609 18261,22608 18261,22606 18264,22608 18261,22605 18265,24605 18262,24608 18263,24611 18267,24608 18267,24613 18271,24615 18272,24610 18273,24614 18272,24619 18276,24621 18281,24625 18276,24622 18280,24622 18282,24621 18279,24622 18277,24627 18279,24631 18284,24634 18289,24634 18292,24634 18294,24636 18299,24639 18294,24644 18295,24647 18298,24647 18301,24643 18303,24643 18306,24639 18311,24636 18315,24641 18317,24645 18317,24648 18319,24649 18323,24649 18328,24652 18330,24652 18329,24652 18327,24655 18322,24656 18319,24658 18319,24661 18320,24664 18316,24660 18320,24657 18318,24657 18320,24659 18325,24660 18327,24661 18323,24656 18327,24652 18323,24654 23323,24658 28323,24660 28318,24665 28319,24666 28323,24668 28325,24668 28328,24672 28325,24667 28328,24668 28325,24670 28326,24665 28330,24668 28334,24672 28336,24672 28336,24668 28339,24672 28340,24672 28338,24674 28341,24675 28346,24675 28351,24677 28356,24679 28357,24681 28356,24677 28360,24680 28355,24684 28354,24688 28356,24688 28351,24690 28356,24686 28361,24691 28364,24692 28364,24692 28365,24692 31365,24693 31370,21693 31370,21692 35370,21688 35372,21692 35377,21695 35377,21697 35377,21698 35379,21698 35374,21701 35375,21701 35379,21703 35380,21708 35383,21706 36383,21709 36383,16709 36383,16710 36386,16715 36382,16711 36386,16706 36388,16706 39388,16706 39383,16706 39379,16711 39379,16711 39376,16714 39381,16716 39386,16717 39389,16717 39391,16720 39391,16723 39387,17723 39392,17726 43392,17722 43396,19722 43399,19724 43394,19727 43391,19725 43395,19723 43398,19726 46398,19730 46400,19730 46403,19730 46405,19734 46407,19734 46410,19733 46407,19728 46412,19726 46416,19726 50416,19723 50417,19723 50416,19718 50420,19719 50424,19718 50429,19713 50433,19715 50437,19718 50442,19719 50442,19718 50444,19719 50439,19721 50443,18721 50444,18721 50446,18721 50450,18726 50451,18727 50453,18722 50451,18727 50456,18729 50455,18731 50458,18726 50458,18728 50458,18730 50463,18730 50460,18729 50456,18727 50460,18730 50462,18734 50457,18739 50455,18744 50457,18744 50461,18748 50461,18748 50466,18745 50468,18749 50463,18750 50468,18754 50472,18754 50472,18759 50472,18760 50468,18763 50473,18760 50477,18762 50477,18766 50481,18769 50483,18769 50481,18772 50482,18776 50482,18779 50486,18779 50489,18781 50489,18783 50494,18786 50496,18786 50495,18786 50498,18784 50499,18784 50499,21784 50504,21788 50502,21785 49502,21790 49501,21790 49498,21795 49494,21800 49494,21801 49495,21801 49500,21797 49505,21799 46505,21802 46508,21798 46513,21799 46516,21802 46516,21805 46519,21800 46524,21805 46527,21804 46528,21801 47528,21801 47531,21804 47533,21804 47529,21804 47534,21809 47538,21808 47538,21812 47540,21812 47535,21813 47532,21810 52532,21812 52535,21817 52536,21820 52536,21824 52541,21828 52545,19828 52545,19829 52547,19829 52551,19833 52555,19831 52552,19826 52557,17826 52562,17827 52567,17830 52568,17830 52572,17830 52575,17830 52575,17830 52574,17831 52578,17827 52582,17827 55582,17829 55583,17834 55583,17839 56583,17843 56579,17846 56580,17850 56584,17848 56588,17853 56592,17851 56596,17856 56596,17856 56600,17851 56601,17856 56601,17856 56604,20856 56604,20861 56601,20865 56596,20865 56597,20866 56597,20869 56602,20871 56603,20874 56607,20871 56605,20872 56610,20874 56613,20874 56612,20876 56617,20876 56622,20876 56626,20876 56621,20879 56623,20880 56627,20883 56624,20880 56629,20880 56629,20881 56630,20884 56630,20884 56635,20881 56636,20879 56637,20876 56632,20879 56629,20881 56633,20878 56634,20879 56634,20879 56637,20879 56642,20884 56638,20879 56639,20884 56634,20885 56631,20886 56633,20889 56632,20894 56627,20894 56631,20894 56631,20898 56632,20903 56632,20908 56630,20907 56633,20907 56636,20903 56641,20904 56641,20904 56637,20900 56639,20905 56642,20910 56643,20905 56648,20910 56653,20915 56654,20910 56659,20910 56663,20910 56664,20912 56664,20912 56666,20917 56670,20922 56670,20918 56673,20920 56675,20920 56677,20920 56677,20921 56681,20926 56677,20931 56677,20934 56680,20934 56684,20936 56689,20938 56689,20938 56690,20940 56695,20935 56696,20939 56697,20939 56699,20940 56696,20941 56694,20940 56698,20945 56700,20947 56702,20947 56707,20950 56712,20954 56713,20950 56710,20952 56706,20955 56704,20957 56708,20953 56709,20951 56714,20953 56716,20957 56720,20957 56722,20959 56725,20958 56727,20959 56728,20962 56731,20963 56736,20965 56741,20965 56740,20967 56742,20969 56737,20969 56742,20974 56744,20979 56744,20978 56745,20974 56748,20970 57748,20972 57749,20974 57751,20971 57754,20972 57752,20977 57755,20981 57758,20981 57763,20981 57765,20984 57765,20982 57767,20982 57763,20987 55763,20989 55767,20991 55770,20987 55771,20988 55774,20988 55777,20991 55775,21991 55778,21996 55778,22000 55783,22001 55783,22005 55783,22010 55785,17010 55781,17011 55783,20011 55778,20015 55783,20018 55786,20015 55791,20015 55795,20019 55792,20019 55792,20021 55792,20022 55788,20023 55783,20028 55786,25028 55790,26028 55795,26029 55790,26030 57790,26033 57794,26032 57798,26036 57802,26039 57805,26042 57805,26046 57810,26050 57811,26054 57815,26054 57819,26050 57819,26055 57820,26060 57822,26063 57823,26066 57826,26068 57824,26073 57826,26077 57831,26082 57831,26078 57836,26082 57839,26084 57839,26086 57834,26082 57834,26083 57835,26082 57840,26083 57844,26086 57843,26083 57846,22083 57849,22084 57847,22089 57847,22094 57848,22094 57853,22094 57850,22095 59850,22095 59855,22098 59858,22099 63858,22099 63861,21099 63861,21104 63862,19104 63862,19108 63864,19109 63864,19112 63868,19113 63873,19117 63876,19121 63875,19116 63877,19115 63882,19117 63878,19122 63883,19125 63884,19129 63879,19133 63879,19135 63874,19139 63871,19136 63871,19136 63873,19140 63868,19140 63873,19144 63877,20144 63879,20144 63876,20146 63880,20148 63878,20149 63877,20149 63879,20150 63882,20155 63886,20155 64886,20159 64884,20160 64884,20161 64887,20160 64887,20164 64887,12677 32287,12677 32292,12679 32297,12678 32298,12682 32294,12687 32294,12682 32296,12682 32296,12683 32298,12683 32301,12682 32305,12685 32309,12686 32311,12686 32316,12691 32311,12692 32316,12692 32312,12697 32314,12700 32319,12705 32322,12706 32327,12704 32329,12705 32332,12702 32334,12707 32338,12703 28338,12704 28340,12700 28345,12702 28345,12702 28345,12701 28348,12704 28349,12704 28345,12709 28342,12709 28343,12714 28347,12718 28351,12723 28352,12727 28353,12730 28355,12728 28353,12733 25353,15733 25353,15736 25355,15740 25356,15745 25356,15747 25351,15752 25353,15752 25354,15754 25354,15754 25353,15759 25352,15763 25352,15764 25357,15759 25352,15761 27352,15760 27354,15760 27354,15760 27355,15762 27357,15762 27354,15759 27354,15759 27354,15763 27358,15767 32358,15764 32360,15769 32360,15767 32360,15765 37360,15770 37362,15772 37363,15774 37367,15779 37363,15780 37359,15779 37363,15782 37366,15780 37370,15775 37370,15778 37365,15781 37360,15785 37356,15785 39356,15789 39358,15789 39360,15794 39365,15794 39370,15797 39375,15797 39380,15799 39379,15804 39376,15805 39377,15807 39380,15808 39385,15809 39386,15807 39386,15809 39386,15810 39389,15815 39392,15820 39392,15819 39396,15820 39398,15820 39395,15825 39400,15823 39405,15824 39403,15829 39403,15834 39406,15836 39411,15831 39415,15832 39415,15833 39415,15838 39417,15839 39419,15839 39414,15842 39413,15846 39418,15843 39420,15842 39423,15839 39420,15840 39422,15839 39420,15842 39415,15846 39410,17846 39415,17845 39411,17847 39416,17849 39420,18849 39424,18847 41424,18852 41424,18849 41429,18849 41432,18848 43432,18852 43433,18855 43433,18859 43435,18855 47435,18858 47440,18861 47435,18866 47435,18866 47439,18869 47442,18871 47445,18873 47445,21873 47445,21876 47444,21873 47449,21878 47451,21883 47456,21880 47454,21880 47454,21880 47457,21883 47459,21887 47464,21890 47465,21893 47467,21894 47464,16894 47462,16899 47457,16898 47455,16893 47456,16897 47458,16896 47455,16898 47459,16900 47464,16903 47469,16908 47471,16903 47474,16901 47473,16906 47473,16901 47478,16904 47479,16906 47475,16906 47474,16907 47475,16906 47479,16901 47482,16901 47482,16905 47486,16908 47487,16911 47490,16915 47490,16917 47492,16921 47497,16926 47498,19525 12175,19525 12176,19521 12177,19522 12181,19525 14181,19521 14181,19519 14185,19519 14189,19524 14192,19527 14192,19529 14196,19534 14200,19535 14205,19538 14208,19540 14204,19545 14207,19545 14207,19547 14210,19550 15210,19554 15210,19555 15210,19555 15213,19560 15213,19562 15212,19564 15213,19569 15210,19570 15214,19573 15214,23573 15217,28573 17217,28574 17220,28574 17219,28574 17224,28576 17229,28577 17233,28577 17236,28579 17236,28580 17238,28584 17243,28588 17248,28587 17252,28587 17252,28582 17255,29582 17259,29577 17260,29578 17262,29583 17257,29585 17257,29586 17260,29586 17265,29590 17267,29593 17267,29594 17267,29599 21267,29603 21271,29603 21272,29605 21274,29607 21276,29612 26276,29613 26279,29616 26280,29621 26277,29621 26277,29623 26282,29626 26285,29631 26289,29628 26289,29632 26290,29637 26294,29642 26290,29646 26292,29648 26291,29649 26288,29653 26293,29655 26292,29655 26293,12702 28345,12703 28348,12698 27348,12699 27349,12698 27354,12700 27354,12700 27355,12703 27360,12703 27361,12700 27362,12704 27367,12701 27371,12706 27376,12710 27372,12710 27373,12710 27368,12715 27370,12713 27374,12716 27378,12716 27380,12714 27379,12719 27374,12718 27373,12722 27376,12724 27376,12729 27371,12733 27372,12733 27377,12735 27373,12735 27374,12737 27378,12739 27379,12742 27381,12739 27381,12739 27376,12743 27378,12743 27379,9743 27375,9744 32375,9745 32377,9746 32374,9746 32372,9750 37372,9752 37375,9754 37375,9751 37377,9755 37379,9759 37379,9763 37383,9766 37385,9767 37382,9768 37383,9765 40383,9770 40378,9770 40382,9775 40384,9777 40386,9782 40391,9778 40395,9773 40395,9778 40397,9779 40399,9781 40402,9781 40398,9781 40393,9780 40396,9782 40399,9785 40398,9786 40395,9789 40390,9793 40387,9798 40390,9803 40394,9805 40397,9800 40400,9795 40402,9800 40403,9802 40407,9807 40410,9806 40407,9807 40403,9812 40400,9814 40403,9819 40403,9819 40400,9822 40405,9824 40405,9822 40408,9827 40410,9831 40413,9831 40413,9826 40412,9827 40417,9832 40418,9832 40416,9833 41416,9833 41421,9834 41416,9838 41416,9838 41421,9840 41422,9844 41424,9839 41424,9843 41427,9845 41430,9849 41430,9849 41425,9852 41423,9855 41426,9858 41429,9860 41434,9862 41436,9866 41441,9868 41436,9869 41434,9871 41434,9875 41437,9877 41437,9881 41438,9883 41438,9879 41438,20903 56641,20898 56644,20903 56647,20901 56649,20903 56645,20905 56650,20909 53650,20905 53650,20910 53652,20907 53655,20912 53652,20916 53656,20917 53656,20912 53661,20912 53660,23912 53663,23912 53663,23909 53663,23912 53665,23913 53669,23911 53669,23915 53669,23912 53671,23916 53670,23917 53675,23922 53680,23927 53683,23930 53688,23935 53689,23935 53691,23935 53691,23931 53692,23931 53694,27931 53693,27933 53695,27937 53695,27942 53699,27947 53701,27949 53703,27949 53704,27949 53708,27952 55708,27953 55710,27949 55710,27953 55710,27958 55713,27959 55718,27960 55722,27962 55725,27965 55730,27965 55732,27968 55730,27969 55733,27972 55733,27975 55734,27975 55734,27979 55737,27981 55733,27982 55732,32982 55732,32979 55734,32978 55737,32978 55738,32974 55742,32977 55746,32981 55750,32985 55746,32983 55747,32987 55750,32992 55751,32995 55751,32998 55751,32998 55753,32998 55753,32993 55753,32995 55757,32999 55758,33002 55760,33002 55761,33005 55766,33005 55767,33000 55764,32997 55767,32997 55771,33001 55773,32998 55777,33001 55777,33005 55776,33004 55776,33009 55781,33014 55786,33014 55790,33015 55790,33016 55790,33015 55786,34015 55787,34019 55790,34019 55791,34021 55793,34017 55793,34019 55796,34016 55797,34020 55793,34020 55796,34023 55792,34023 54792,34025 54797,34028 54800,34029 54799,34029 54795,34034 54796,34036 54797,34041 54792,36041 54797,36045 54801,36048 54803,36051 54804,36053 54806,11439 8033,11441 8038,11441 8039,11441 8040,11445 8035,11441 8035,11442 8039,11438 8035,11438 8035,11443 8039,16443 8038,16444 8038,14444 8040,14448 12040,14451 12036,14455 12038,14455 12041,14456 12046,14459 12049,14457 12051,14458 12046,14458 12047,14459 12042,14464 12042,14465 12047,14470 12050,14471 12055,14471 12058,14468 12060,14473 10060,14477 7060,14477 7062,14474 7062,14474 7067,16474 7063,16471 7065,16474 7067,16471 7072,16471 7068,16476 7066,16481 7069,16482 7072,16487 7072,16487 7077,16488 7077,16493 7076,16493 7079,16497 7079,16500 7079,16502 7079,16502 7079,16505 7075,16504 7080,16501 7077,16497 7079,16501 7081,16497 7080,16496 7084,16500 7086,16495 7087,16498 7084,16501 7087,16496 7087,16496 7083,17496 7083,17500 7083,17505 7088,9860 41434,9864 41435,9864 41435,9865 42435,9860 42435,9862 42436,9863 42434,9863 42430,9862 40430,9863 40427,9863 40428,20608 16239,20605 16242,20610 16237,20614 16237,20615 16242,20611 16242,20612 16245,20609 16244,20604 16242,22604 16237,22608 16239,22607 16240,22610 16244,22610 16241,22615 16246,22616 16246,22614 16251,22616 16251,22617 16249,22619 16254,22623 16252,22618 16255,22618 16259,22620 16262,22615 16262,22618 16263,22622 16263,22626 16265,22629 16266,22628 16269,22633 16267,22636 16268,22636 16267,22641 16269,22646 16269,22645 16271,22646 16273,22650 16271,22655 16274,22655 16277,22658 16279,22660 16280,22658 16280,22661 20280,22663 20282,19663 20285,19658 20288,19658 20292,19661 20295,19666 20298,19670 20301,19671 20301,19675 20301,19677 20306,19675 20311,19674 20315,19678 20318,19677 20314,19680 20315,19682 20310,19684 20314,19683 20316,19687 20315,19688 20316,19688 20319,19693 20319,19698 20322,19702 20323,19698 20323,19702 21323,19707 22323,8508 20119,8509 20119,8510 20116,8515 20113,8518 20115,8519 20116,8516 20120,8520 20119,8520 20118,8525 20123,8527 20125,8527 20125,8528 20123,8530 20126,8533 20123,8535 20127,8532 20132,8534 20136,8538 20138,8542 20141,8537 20143,8537 20145,8542 20145,8547 21145,8548 24145,8552 24145,8557 24150,8560 24147,8562 24151,8566 24156,8569 24160,8574 24156,8579 24159,8584 24164,8587 24164,8585 24167,8588 24170,8591 24171,8589 24172,8590 24176,8595 24177,8593 24174,8596 24178,8600 24179,8603 24175,8602 24178,9602 24182,9605 24177,9609 24178,9610 24182,9608 24178,9603 24183,9606 24188,9608 24193,9609 24195,9614 24196,9616 24197,9618 24201,9618 24205,9613 24209,9612 24214,9608 24211,9603 24216,9607 24221,9611 24221,9615 24217,9617 24217,9618 24221,9623 24225,9623 24225,9626 24225,9630 24225,9630 24222,9626 24223,9626 22223,9627 22223,9626 22226,9629 22228,9632 22228,9636 22225,9638 22226,9639 22227,9634 22230,9634 22231,9639 22235,9639 22240,9641 22242,9642 22246,9647 22249,9652 22250,9655 22255,9651 22256,9652 22253,9652 22256,9652 22261,9655 22262,9657 22257,9659 22261,9659 22261,9657 22264,9657 22261,9656 22264,9661 22267,9662 22270,12662 22270,12665 22265,12669 22270,12669 22270,12673 22269,11356 7007,11361 7010,11361 7010,11357 7014,11356 7015,12356 7020,12357 7015,12361 7017,11361 7018,11364 7017,11359 7018,11355 7017,11354 7020,11357 7020,11361 7023,11364 12023,11368 12028,11368 12029,11371 12030,11372 12034,14372 12034,14372 12039,14372 12042,14376 12045,14381 12047,14379 12047,14381 12049,14384 12054,14385 12051,14388 12056,14384 12056,14384 12061,14381 12058,14386 12062,14386 12059,14391 12059,14396 12060,14397 12060,14398 12056,14403 12051,14408 12052,14410 12057,14409 12057,14414 12053,14414 12051,14415 12051,14420 12049,14423 12048,14427 12044,14427 12044,14425 10044,14421 10049,14424 11049,14426 11054,14427 11059,14429 11064,14433 11064,14434 11064,14437 11065,14441 11068,14444 11072,14445 11076,13445 12076,13445 12077,13445 12081,13444 14081,13446 14081,13446 14078,13449 14083,13447 14084,13450 14085,13452 14090,13453 14087,13456 14084,13457 14083,13461 14081,13463 14082,12463 14082,12463 14087,12463 14087,12464 14087,8464 14087,8465 14083,8465 14080,8467 14085,8472 14085,8473 14085,8476 14090,8474 14094,8475 14094,8480 14094,8481 14099,8476 14103,8476 14107,8480 14111,8483 14116,8488 14120,8488 14118,8488 14120,8483 14115,8481 14118,8485 17118,8485 17114,8488 17110,8488 17115,8484 21115,8484 21118,8486 21120,8487 21120,8482 21115,8487 21118,8490 21122,8494 21127,8497 21132,8497 21133,8500 23133,8503 23135,8507 23135,8508 23132,8511 23129,8512 23125,8517 23126,8522 23125,8527 23129,8522 23131,8527 23132,8530 23132,8531 23128,8533 23132,8533 23134,8533 23139,8533 23144,8536 23143,8537 23146,8533 23146,8533 23149,8537 23152,8533 23157,8530 23158,8532 23162,8536 23162,8536 23165,8536 23165,8540 23170,8544 23171,8548 23169,8547 23173,8551 23176,8552 23173,8548 23169,8553 23173,8553 23170,8548 23173,8549 23173,8546 22173,8547 22174,8551 22177,8550 22179,8552 22183,8553 22183,8553 22184,8557 22185,6557 22185,13598 20226,13601 20227,13604 20229,13608 20233,13610 20234,13605 20237,17605 20237,17610 20242,17605 20242,17602 20241,14602 20241,18602 20236,18606 20239,18606 20244,18608 20241,16608 20245,16611 20240,16615 20239,16610 20234,16611 20232,16613 20235,16608 20235,16608 20239,16613 20242,19734 46410,19734 46410,19738 46414,19737 46414,19735 46415,19737 46418,19741 46421,19744 46423,23912 53671,23908 53673,27908 53675,27913 54675,27917 58675,27921 58677,27925 58678,27930 58678,27926 58683,27930 58686,27931 58691,27931 58695,27934 58700,27936 58699,27936 58699,27941 58695,27942 58695,27947 58699,27952 58699,27954 58703,27957 58704,27962 58708,27958 58706,27959 58703,27962 58703,27967 58706,27967 58701,27965 58701,27962 58702,27966 58703,27971 58704,27976 58706,27980 58709,27980 58712,27975 58711,27971 58716,27971 58713,27968 58712,27968 58712,27971 58711,27968 58713,27968 58710,27969 58708,27972 58706,27976 58711,27978 58716,27979 58716,27983 58718,27978 58718,27981 58719,27981 58723,27986 58725,27986 58728,27986 58731,27991 58734,27996 58738,27993 58736,27995 58732,31995 58736,31990 58735,31993 58738,31990 58734,31995 58729,31996 58729,31999 58731,31994 58726,31996 58731,12463 14087,12465 14090,12465 14093,12463 14090,12463 14095,12461 14092,12464 14093,12459 14091,12459 14091,12459 14091,12459 14096,12461 14100,12458 14103,12457 14101,12452 14101,12452 14106,12453 14103,12453 17103,12455 17104,15455 17104,15460 17108,15463 17104,15458 17108,18458 17108,21458 17105,21461 17105,21464 17110,21467 17115,21464 17120,21464 17120,21468 17123,21470 17126,21465 21126,21461 21126,21464 21128,21464 21132,21468 21137,21471 21142,21475 21146,21471 21146,21476 21147,21473 21151,21475 25151,21475 25152,21477 25153,21481 29153,21479 29158,21484 29162,21488 29162,21490 29165,21487 29170,21488 29167,21489 29162,21493 29164,21493 29169,21498 29169,21499 29164,21495 29167,21498 29167,23498 29170,23498 29169,23503 29172,23505 29171,23510 29167,23514 29164,28514 29168,28514 29172,28514 29174,28512 29172,28513 29176,28518 29179,28518 29182,28521 29177,28521 29179,28519 29179,28517 29179,28515 29177,28519 29177,28519 29179,28524 29184,28527 29183,28527 29185,28523 29187,28523 29184,28525 29189,28522 29189,28518 29186,28523 29189,28519 29189,28521 29189,28526 29193,28529 29193,28529 29196,28534 29200,28538 32200,28537 30200,28539 30202,33539 30207,33539 30209,33534 30205,33535 30208,33536 30208,33538 30213,33538 30214,33542 30218,33545 30221,33548 30222,33551 30225,33552 30227,33554 30231,33555 30233,33560 30228,33563 30225,33564 30229,33565 34229,33565 34234,33570 34231,33572 34235,33572 34239,33573 34243,33578 34239,33579 34243,33574 34247,33573 34247,33576 34243,33573 37243,33573 37246,33568 37241,33568 37244,33573 37239,33578 33239,33574 33241,33574 33239,33578 38239,33583 38242,33587 38242,33590 38242,33594 38243,33596 38247,33599 38248,33599 38252,33595 38252,33598 38257,33603 38258,33604 37258,33609 37255,33604 37257,33607 37262,33607 37265,33609 37266,33614 37271,33614 37276,33616 37278,33616 38278,33616 38282,33621 38284,33621 38288,33621 38285,33618 38289,33616 38291,33616 38294,33611 38296,33608 38301,33610 38305,33610 38300,33612 38303,33617 38308,33621 38309,33625 38305,33630 38307,33634 42307,33636 42310,33638 42314,33634 42312,33631 42315,33631 42315,27931 58691,27936 58693,27937 58695,27940 58700,27943 58703,27943 58708,27946 58709,27950 58711,27950 58714,29950 58718,29951 58723,29947 58728,29947 58732,29950 58727,29950 58727,29955 58730,29960 58734,29964 58732,29961 58734,29963 58735,29968 58739,29968 58741,34968 58739,34971 58739,34972 58739,34973 58740,34968 58741,34970 58743,34974 58745,34977 58749,34979 58744,39979 58745,39979 58742,39978 58744,39982 58748,39983 58744,39983 58744,39979 58747,39979 58752,39983 58757,39982 58759,39985 58759,39986 58759,39983 60759,39986 60762,39990 60767,39994 60770,39994 60770,39997 60770,39997 60770,40000 60775,40002 60775,40003 60779,40007 60784,40008 60787,40011 60788,40015 60788,40016 60790,40016 60792,40021 60788,40025 60788,40030 60788,40026 60786,40027 60786,40030 60787,40032 60792,40037 60795,40032 60800,40032 60799,40035 64799,40035 64801,40036 64806,40041 64803,40037 64805,40038 64801,40040 64804,40036 64804,40040 64805,40045 64810,40048 64811,40051 64813,40051 64817,13491 17139,13486 18139,13489 18139,13494 20139,13492 20138,13494 20141,13499 20145,13499 20145,13499 20148,13503 20149,13500 20149,13505 20151,9367 11012,12367 11015,12369 11011,12364 11012,12364 11015,12359 11011,12354 11011,12354 11014,12359 11017,12356 11015,12361 11015,12361 12015,12365 12016,12369 8016,12374 8021,12373 8025,11373 8021,11368 8021,11373 8024,12700 27362,13700 27363,13705 27364,13710 27368,13705 27369,13707 27367,13707 27371,13709 27375,13712 27377,13714 27373,13712 27376,13714 27379,13713 27382,13718 27384,13713 27380,13713 27385,13711 27386,13715 27386,13719 27386,13719 27389,15719 27394,15724 27398,15729 27400,15734 27401,15734 27401,15729 27396,15732 27396,15735 27397,15734 27399,15733 27400,15729 27400,15734 27400,15729 27405,15734 27405,15739 27408,15739 27408,15741 27412,15743 27416,15743 27416,15740 27416,16740 31416,16743 31421,16738 31425,16742 31430,16742 31435,16743 31439,16743 31444,16741 31449,16746 31450,16747 31455,16742 31459,16738 31463,16742 31466,16742 31471,16742 31471,16742 31471,16744 31475,16749 36475,16749 36473,16753 36478,16757 36474,16761 36477,16759 36478,16761 36481,16760 36484,16761 36485,16760 36486,16765 36491,16766 36494,16771 36498,16769 36501,16771 37501,16774 37504,16769 37507,16769 37507,16772 37503,16772 37508,16774 37511,16774 37510,18774 37515,18777 37515,18772 37512,18775 37514,18777 37517,18778 37519,18779 37517,18776 37517,18778 37520,18780 37520,18785 37522,18785 37526,18787 37523,18786 37520,18790 38520,18789 38520,18792 38522,18797 38527,18802 38529,20802 38534,20804 38535,20803 38540,20802 38539,20806 38543,20811 38546,20814 38543,20812 38541,20808 38546,20811 38544,20815 38539,20816 38535,20818 38531,20815 38531,20814 38528,20814 38533,20817 38536,20816 38539,20821 38540,20818 38542,20820 38540,20816 38540,20821 38540,20823 38541,20828 38541,20831 38546,20836 38547,20836 38548,20835 38553,20835 37553,20835 37558,20837 37558,20842 37560,20846 37561,20846 37564,20849 37569,20854 37564,20854 37565,20850 37566,20852 38566,20856 39566,20861 39566,20863 39562,20867 39566,20872 39567,20868 39566,20873 39568,20876 39573,20876 39573,20880 39575,20884 39579,20885 39580,20889 39580,20891 39584,20888 38584,20889 38587,20890 38592,20891 37592,20892 37597,20894 35597,20895 35600,20897 35603,20899 35605,16678 18322,16681 18323,16682 18323,16686 18328,16690 18326,16693 18331,11693 18335,11692 18332,11695 18332,11698 18335,11703 18335,11703 18336,11702 18339,11698 18344,11702 18349,11705 18353,11704 18357,11707 18360,11707 18359,11711 18358,11716 18358,11713 18358,11712 18360,11710 18360,11710 18362,11710 18362,11710 18367,11710 18366,11707 18366,11706 18365,11710 18369,11715 18371,11714 18374,11712 18376,11711 18377,11711 18379,11712 18384,11715 18385,11711 18385,11714 18387,11717 18389,11718 18386,11721 19386,11723 19391,11722 19395,11722 19396,11723 19398,11726 19398,11729 19403,11733 19408,11736 19407,11733 19411,6733 19407,6735 19402,6738 19402,6743 19406,6746 19406,6742 19411,6742 19414,6742 19414,6746 19419,6746 19423,6746 19418,6749 19418,6747 19418,6748 19420,6748 19424,6748 19424,6751 19427,6751 19429,6752 19429,9752 19426,9754 19428,9759 19430,9756 19431,9751 19435,9753 19440,9757 19445,9755 19443,9757 19448,9757 19448,9759 19451,9763 19451,9766 19454,9766 19456,9770 19459,9770 19462,9770 19466,9766 19467,9771 19468,9772 19468,9769 19469,9768 19470,9770 19470,9774 19473,9778 19470,9781 19470,9786 19471,9789 19471,9789 19473,9792 19478,9795 19475,9800 19478,1256 2899,1260 -1101,1256 -1097,1255 -1093,1255 -1094,1259 -1089,1260 -89,2260 -84,2258 -84,2263 -88,2267 -89,2268 -91,2269 -86,2272 -86,2272 -82,2273 -77,2276 -79,2281 -81,2283 -79,2287 -75,2292 1925,2297 1930,2299 1930,2303 1932,2308 1937,2308 1936,2313 1937,2315 1934,2316 1935,2311 1936,2316 1937,2319 1938,2322 1940,2327 1940,2331 1940,2327 1943,2329 1945,2331 1950,2336 1950,2339 1954,2338 1954,7338 1954,7337 1958,7341 1960,7341 1964,8550 20152,8554 20152,8553 15152,8550 15152,8554 15154,8552 15149,8552 15153,8556 15151,8556 15148,8552 15152,8547 15149,8552 15154,8552 15155,8553 15156,8550 15156,8553 15160,8556 15164,8558 15163,8561 15163,8563 15167,8559 15169,8559 15166,8564 15167,8568 15171,8572 16171,8572 16173,8574 16170,8571 16174,8575 16174,8576 16174,8576 16174,8580 16178,8579 16183,8574 16184,8576 16184,7576 16186,7572 16181,7577 16181,7577 16185,7578 16190,7583 16185,7583 16185,7587 16185,12587 19185,12582 19188,12587 19193,12587 19195,10534 21158,10538 21162,10540 19162,10543 19158,10547 19158,10551 19160,10551 19158,10554 19158,10553 19157,10555 19157,10555 19154,10552 19156,10553 19161,10555 19166,10558 19165,10560 19165,10561 19165,10561 19165,10564 19166,10567 19164,10570 19162,10575 19165,10577 19164,10577 19168,10578 19168,10574 19171,10574 19172,10571 19175,10573 19178,6503 16143,6507 16146,6509 16142,6510 16142,6510 16143,6512 16143,6514 16146,6517 16148,6522 16143,6525 16143,6530 16143,6534 16146,6531 16144,8490 16106,8490 16106,8492 16109,8489 16110,8491 16106,8487 16109,8488 16104,8490 17104,8495 17108,8490 17109,8493 17108,8498 17111,8500 17111,8500 17109,8501 17113,8506 17118,8506 17118,8506 17123,4506 17125,4511 17123,4516 17126,4514 17125,4519 17124,4520 17126,4525 17129,4530 17124,4526 17124,4528 17124,4533 17127,4535 17127,4531 16127,4531 16124,4534 16124,4538 16125,2538 16130,2539 16131,2544 16133,2544 16129,2540 16129,2545 16129,2550 16126,7550 16126,7555 16128,7559 16124,7559 16129,7560 16132,7561 16128,7566 16132,9566 16136,9568 16136,9573 16141,9570 16144,9571 16146,9573 16150,9577 16153,9581 16148,9579 16153,9584 16157,9586 16160,9581 16162,9578 16165,10578 16162,10579 16163,10574 18163,10570 18164,10568 18164,10570 18169,10572 18170,10575 18170,10575 18175,10579 18176,10580 18176,10585 18176,10581 20176,10586 20178,10587 20178,10585 20179,10585 20177,10581 20178,10584 20183,10586 20187,10590 20187,10591 20190,10587 20188,10591 20187,10591 20192,10592 20191,10597 20195,10602 20194,10602 20195,10607 20197,10607 20198,13607 20201,13607 20200,13607 20204,13604 20204,13605 20209,13607 20209,13612 20214,13615 20218,13615 20218,13619 20220,13624 20224,13628 20219,18628 20216,18630 20213,18635 20213,18632 20211,18629 20211,18632 20215,18632 20216,18632 20217,18632 20217,18627 20214,18630 20209,18633 20212,18636 20212,18638 20217,18643 20222,22643 20219,22643 20219,22644 20219,22644 20214,22645 20216,22645 21216,22646 21220,22642 21224,22642 21221,22641 21224,22638 21229,22641 21232,22642 21235,22643 21238,22644 21236,22649 21237,22704 18411,22704 18412,22699 18412,22696 18416,22701 18412,22703 18416,22698 18416,22693 18418,22695 18422,22698 18422,22700 18426,22705 18427,22706 18427,22708 18432,22708 18432,22704 18431,22709 18427,22709 18432,22709 18436,22713 21436,22718 21438,22719 21437,22721 21440,22725 21443,22727 21445,22724 21450,22724 21451,22727 21453,22730 21453,22730 21458,22734 21460,22738 21464,20738 21464,20742 21465,22742 21465,22741 21464,22736 21464,22738 21464,22742 21460,22742 21460,22744 21458,22743 21458,22741 21455,22741 21460,22739 21456,22739 21458,22734 23458,22732 23458,22733 23463,22731 23467,22731 23469,22736 23472,22739 23472,22742 23471,22744 23471,24744 23466,24744 23468,24739 23471,24742 23474,24747 23478,24747 23481,24747 23483,24747 23486,24751 25486,24753 25489,24758 25493,24762 25497,24764 25499,24769 25496,24773 25498,24777 25499,24779 25503,24782 25500,24782 25498,24777 25498,24779 25495,24775 25495,24776 25495,24777 25495,24781 25500,24778 25503,24778 25499,24780 25500,24777 22500,24775 22505,24777 22505,24777 22501,24778 22502,24778 22505,24774 22509,24776 22509,24776 22509,24781 22509,24784 22511,24780 22513,24780 22514,24783 22515,24786 22520,24786 22520,24791 22518,24788 22517,24791 22522,24794 22525,24791 22524,24791 22528,24789 22530,24794 22530,24799 22525,24795 22524,24798 22520,24796 22516,24801 22511,24803 22516,24804 22521,24804 22526,24806 22524,24805 22524,24809 22529,24810 22531,24813 22536,24817 22536,24815 22535,24810 22530,24815 22530,24816 22530,24818 22531,24818 22531,24818 22533,24822 22533,24820 22530,24816 22529,24820 22532,24822 22533,24822 27533,24823 27536,24826 27540,24829 27541,24832 27546,24833 27549,24832 27553,24833 27552,24833 27551,24836 27551,24839 27554,24841 27554,24841 27556,24842 27559,24847 27557,24847 27562,24842 27566,24840 27564,24842 27568,24844 27563,25844 27565,25847 27569,25848 27564,25851 27561,25855 27559,25856 27556,25852 27556,25857 27561,25857 27564,25858 27564,25863 27567,25868 27567,25871 27564,25872 27565,25875 27570,25877 27573,25878 27575,25879 27574,25884 27579,25887 27577,25886 27579,25882 27582,25882 27578,25882 27582,25884 27578,25887 27583,25891 27584,25895 27582,25895 27582,25898 27583,25900 27580,11433 8033,11435 8037,11439 8040,11444 8044,11439 8048,11441 8045,11446 8044,11446 8039,11451 8038,11451 8043,11450 8046,11451 8046,11447 8049,11443 8052,11445 8057,11441 8058,11439 8060,11444 8056,11445 8053,11448 8053,11450 8049,11455 8044,11453 8042,11454 8044,11451 8049,11453 8049,11458 8052,11459 8055,11457 8053,11460 8053,11461 8055,11465 9055,11466 9056,12466 9058,12467 9054,12472 4054,12467 4056,12467 4059,12470 4058,12468 4060,14468 4064,14467 4063,14471 4060,14473 4062,14471 4067,14468 4072,14471 4076,14466 4077,14467 4074,14472 4075,14472 4080,14476 4085,14476 4090,14481 4090,14485 4091,14490 4095,14493 4095,14495 4100,14492 4100,14497 4102,14499 4100,14501 4101,14500 4106,14500 4107,14496 4108,14495 4110,14494 7110,33625 38305,38625 38310,38625 38315,38623 38318,38625 38317,38629 38318,38632 38313,38634 38313,38639 38314,38640 38317,38644 38320,38649 38321,38647 38317,38647 38322,38643 38324,38640 38319,38645 38319,38646 38319,38645 38316,38644 38318,38646 38319,38644 38324,38647 38328,38652 38325,38649 38328,38651 38332,40651 43332,40651 43335,40655 43335,40652 43339,40652 43339,40654 43336,40654 43337,40657 43333,40656 43335,40656 43338,40656 43343,40656 43341,40659 43346,45659 43348,45664 43350,45666 43346,45665 43351,45669 43355,45673 43355,45674 43359,50674 43360,50678 43363,50678 43364,50679 43367,50682 43371,50687 43374,50690 43374,50690 43377,50693 43377,50698 43382,50693 43386,50689 43386,50692 43390,50695 43392,50699 43392,50704 43397,50707 43395,50711 43391,50706 43393,50709 43393,50711 43395,50710 43397,50714 43394,50718 43394,50715 43394,50717 43399,50722 43403,50724 43407,50728 43407,50730 43408,47730 43403,47730 43404,47733 43408,47737 43409,47735 43414,47738 43416,47741 43416,47744 43421,47743 43422,47748 43424,47753 43419,47754 43420,47749 43419,52749 43423,52751 43421,52753 43421,52750 43426,52752 43428,52748 43430,52748 43426,52747 43431,52744 43431,52748 43435,52748 43435,52750 45435,52753 45440,52753 45440,52757 45442,52761 45447,52758 45447,52761 45447,52761 45452,52758 45454,52758 45455,52758 45456,52761 45460,52759 45458,52755 45463,52759 45464,52756 45461,52756 45462,52758 45467,52760 45470,52759 45469,52762 45473,52762 45474,15617 20233,15612 20238,15611 20242,15613 20237,15617 20238,15618 20239,15621 20236,15623 20240,15622 20240,15622 20245,15623 20244,15628 20242,15628 20247,15625 20246,15628 20250,15630 24250,15632 24251,15634 24253,15629 24252,15633 24250,15629 24250,15633 24248,15629 24248,15634 24248,15636 24253,15640 24253,15643 24257,15639 24254,15642 24257,15643 26257,15648 26255,15643 26256,15641 26258,15646 26262,15646 26263,15651 26263,15648 26267,15653 27267,15656 27270,15660 27272,15662 29272,15658 29276,15658 29277,15658 29272,15663 29274,15663 29274,17663 29274,17663 29279,17668 29283,17671 29285,17670 29287,17675 29289,17676 29293,17679 29296,17682 29297,17685 29299,17686 29300,17687 29305,17685 33305,17686 33310,17687 33310,17689 33306,17687 34306,17691 34304,17694 34306,17696 34306,17695 34309,17691 34314,17691 34311,17692 34306,17696 34310,17700 34310,17697 34312,17699 34316,17704 34318,17701 34318,17705 34322,17704 34321,17706 34319,17706 34319,17702 34316,17707 37316,17710 37318,19710 37313,19705 37313,19708 37308,19712 37310,19710 37312,19711 37307,19711 37307,19714 37310,19718 37312,19719 37309,19723 37312,19727 37315,19729 37317,19731 37322,19734 37323,19735 37324,19737 37322,19742 37326,19740 37331,19745 37335,19742 37335,19742 37340,19745 37341,19749 37341,19749 37342,19752 37347,19757 37347,19762 37345,19764 37341,19768 37345,19769 37350,19771 37355,19773 33355,19770 33360,19765 33364,19769 33364,19773 33365,22773 33364,22771 33360,22775 38360,22779 38364,22780 38369,22782 38371,22784 38371,22789 40371,22792 40375,22789 40375,22789 40377,22793 40376,23793 40378,23795 41378,23791 41378,23792 41378,23796 41382,23798 41383,22798 41386,22799 41390,22804 41390,22804 41391,22808 41391,22812 41393,22814 39393,22819 39393,22821 39395,22823 39397,22828 36397,22832 36392,22832 36393,22836 36396,22836 36401,22838 36402,19838 36403,19837 36408,19841 36408,19843 36409,19845 36404,19847 36405,19847 36408,19847 36411,19848 36413,19850 36415,19845 36419,19841 36417,19843 36419,19843 36419,19846 36424,19848 36425,19850 36425,19845 36425,19846 36425,19848 36430,19852 36430,19849 36435,19846 36440,19851 36440,19846 36438,19848 36439,19844 36442,19845 36446,19841 36448,19841 36449,19841 38449,19841 38452,19846 38455,19848 38458,19852 42458,19856 42462,19859 42463,19859 42465,19861 42462,19862 42463,19864 42463,19867 42467,19870 42470,19871 42468,21871 42467,26871 42464,26867 42466,26872 42463,26872 42464,26874 42463,26879 42466,26882 42466,26883 42471,26879 42476,26878 42477,27878 42479,27882 42479,27883 42480,27886 42483,27887 42487,27885 42484,27887 42483,27890 42484,27890 42485,22890 42486,22890 42489,22890 42491,22895 42494,22897 42498,22899 42502,22901 42502,22896 42503,22892 42498,22896 42498,22891 42502,22892 42505,22897 42507,22898 42511,22903 42515,22906 42510,22911 42513,17911 42508,17915 42512,17918 42509,17913 44509,17915 44514,17919 44510,17923 44514,17927 44510,17927 44513,17927 44517,17928 44521,21928 44517,21930 44516,21931 44513,21929 44513,21933 44517,21934 44519,21933 44520,21934 44520,21937 44520,21938 44520,21943 44520,21938 44523,21940 44527,21936 44532,21941 44536,21942 44541,21937 44545,21938 44545,21938 44545,21940 44543,21937 44538,21941 44543,21938 44547,21938 44547,21938 44547,21937 44551,21937 44551,21933 44556,21935 44554,21937 44558,21940 44562,21944 44564,21949 44561,21952 44566,21955 44568,21960 44569,21963 44571,21963 44571,21965 44574,25965 44579,25967 44584,25967 44584,25970 44588,22970 41588,22970 41586,22975 41585,22974 41589,22970 41593,22966 41598,22965 41598,22970 41598,22965 41601,22965 41604,22965 46604,22968 46604,27968 46602,27968 46602,25968 46601,25967 45601,25968 45602,25971 45607,25975 45610,25979 45614,25977 45612,25975 45609,26975 45609,26980 46609,26979 46613,26982 46610,26982 46611,26980 46615,26982 46616,26985 46616,26986 46617,26987 46615,30987 46617,30987 46622,30986 46626,30988 46629,30989 46627,17671 29285,17673 26285,17677 26286,17678 26285,17681 26289,15681 26292,15685 26297,10685 26297,10689 26301,10689 26297,10693 26300,10695 26301,10691 26297,10696 26299,10696 26304,10692 26306,10688 26301,10690 26302,10690 26307,10686 26305,10684 26309,10686 26312,10691 26313,10688 26318,10683 26320,10684 26325,10683 26328,14683 26328,14680 21328,14681 21331,14683 21335,14680 21333,14677 21333,14682 25333,14684 25334,14689 25338,14693 25338,14698 25341,14696 25342,18696 25343,20696 25345,20699 25349,20702 25346,20703 25351,20703 25351,20704 25351,20704 25354,20700 26354,20705 26352,20706 26351,20706 26351,20703 26354,20708 26354,20712 26355,20712 26352,20717 26349,20717 26346,20722 26351,20727 26353,20729 26348,20734 26353,24734 26349,24729 26349,24729 26352,24725 26349,24725 26353,24726 26353,24729 26355,24729 26357,24732 26359,24735 26362,24735 26364,24730 26364,24730 26363,24734 26365,24739 26368,24739 26364,24739 26366,24739 26367,24734 26370,24735 26365,24732 26367,24732 26369,24729 26372,24728 26370,24726 26365,24728 26368,24731 26370,24734 26375,24738 26378,24733 26378,24733 26381,24729 26381,13496 17147,13491 17152,13495 17148,13496 17146,13498 17141,13498 17145,13501 17147,13502 17149,13502 17153,13505 17149,13505 17152,13500 17149,13496 20149,13492 20150,13497 20155,8497 20151,8501 20153,8502 20156,8506 20159,8503 20159,12503 19159,12503 19159,12505 19164,12500 19159,12500 19164,12500 15164,12503 15169,12508 15168,12511 15170,12514 15170,12510 15169,12512 15172,12512 15172,12515 15172,12519 15175,12522 15176,12525 15180,12528 15184,23912 53663,23915 53661,28915 53666,28914 53667,28918 53664,28921 53667,28922 53667,28924 53670,28925 53674,28926 53674,28927 53672,28922 53676,28924 53677,28927 53678,28932 56678,28934 56682,28935 56683,28936 56688,28938 56688,28934 56691,28938 56693,28942 56690,28939 56694,28939 56698,28942 56695,28946 56698,28950 56701,28953 56706,28954 56706,28949 56708,28950 56708,28953 56709,28958 56706,28960 56709,28965 56707,28965 56707,28965 56705,28963 56709,28966 59709,28969 59710,28973 59711,28977 59715,28977 59717,28982 59719,28981 59715,28985 59718,28986 59718,33986 59721,35986 59723,35990 59723,35990 61723,35993 61726,35995 61728,35998 61724,36000 61721,36004 61723,36002 61718,36007 61718,36010 61719,36010 61721,36010 61721,36010 61721,36015 61721,36018 61716,36022 61717,36024 61718,36025 61723,36029 61722,36031 61726,36035 61722,36040 62722,36042 62722,36044 62722,36049 62724,36051 62720,36053 62723,36052 62719,36055 62717,36056 62712,36059 62714,36058 67714,36059 67716,40059 67716,40063 67719,40067 67722,40069 67726,40065 67724,40067 67721,40067 67722,40071 67721,40075 67726,37075 67730,37076 67733,37076 67736,37072 67741,37072 67741,37072 67744,37076 67744,37079 67745,37081 67750,37082 67750,37082 67753,37082 67753,37083 67752,37081 67753,37084 67753,37087 67757,37087 67758,37083 67753,37084 67758,37084 67761,37088 67759,37091 67762,37088 67762,37090 67767,37090 72767,37090 72771,37085 72771,37089 72774,38089 71774,38090 71771,38086 71771,38086 71774,38086 71777,38089 71782,38089 71782,38087 71780,38092 71782,38087 71785,38083 71783,38081 71781,38078 71781,38078 71783,38076 71786,38075 71787,38078 71783,38079 71781,38081 71781,41081 71783,41081 71778,41082 71778,41085 71783,41085 71783,41088 71785,41083 71789,41083 71794,41088 71796,41088 71796,41092 71798,41095 71794,41095 71789,41098 71790,41093 71790,41091 71795,41092 71796,41087 71798,41084 71796,41086 71797,41084 71799,41084 71795,41086 71798,41085 71799,41089 71803,41085 71804,41083 71802,41083 71803,41079 71803,41081 71808,41081 71809,41083 71810,41083 71809,41085 71810,41082 71814,41087 71817,41089 71818,41086 71813,41083 71813,39083 71816,39083 71814,39085 71814,39083 71814,39086 71818,39087 71820,39087 71824,39091 71826,39096 71829,39098 74829,39102 74830,39107 74833,39110 74836,39115 74835,39115 74836,39115 74838,39115 74835,39119 74838,39117 74840,39121 74840,39125 74843,39121 74848,39122 77848,39122 77844,39123 77848,39126 77851,39131 77855,39136 77857,39132 77857,39135 78857,39135 78859,39136 78864,39133 78865,39135 78866,39139 79866,39142 79870,39147 79872,39146 79872,39150 79876,39150 78876,39154 78879,39154 75879,39154 75881,39158 75881,39157 75884,39160 75884,39155 75884,39160 75889,39156 75891,39158 75888,39163 75891,39163 75894,39166 75891,39166 75895,39167 75900,39170 75901,39170 75906,35170 75907,35171 75911,35176 75906,35172 75908,35173 75908,35178 75908,35175 75909,35170 75908,35170 75903,35168 75904,35173 75906,35178 75903,35179 75904,35179 75908,35182 75905,35184 71905,35188 71902,35185 71904,35186 71907,35187 71908,35189 71903,35191 71905,35195 71900,35197 71904,35198 71909,35200 71907,35199 71903,35201 71900,40201 71896,25028 55790,25029 55785,28029 55789,28031 55790,28032 55790,28037 55794,28042 55793,28043 55798,28046 55803,30046 55803,30051 55806,30050 55810,30049 55810,30049 55812,30049 55816,30054 55820,2545 16129,2540 16133,2542 16137,2542 16139,2544 16138,2545 16139,7545 16136,7546 16139,7541 16142,7542 16142,7543 20142,7547 20143,11547 20143,11550 20139,11555 20139,11556 20137,11552 20142,11555 24142,11556 24145,11559 24140,11563 24143,11567 24139,16567 24136,16567 24139,16572 24142,16573 24147,14573 24143,14574 24147,14570 24145,14573 24150,14569 24150,14570 24145,14573 24149,14575 24150,14575 24154,14579 24149,14579 24153,14576 24157,14576 24152,14571 24149,14571 24152,14575 24150,14572 24151,15572 24153,15575 24149,15577 24154,15582 24151,15582 24153,15586 24156,15587 24152,15588 24157,15590 24162,15590 24166,15590 24166,20590 24166,17590 24169,17595 24171,17597 24172,17599 24172,17595 24174,17599 24178,17599 24181,18599 24184,18594 24187,18597 24187,18593 24189,18597 24192,18601 24192,18599 24197,18599 24197,18603 24200,18605 24204,18600 24205,18605 24201,18605 24197,18610 24202,18608 24205,18611 24204,18613 24208,18617 24203,22617 24205,22619 29205,22622 31205,22622 31209,22623 31214,22624 31212,22627 31214,22623 31214,22626 31215,22629 31214,22633 31218,22631 31221,22630 31223,22632 31227,21937 44551,21935 44555,21939 44551,21934 44553,21936 44554,21933 44556,21935 44552,21935 44553,21939 44548,21939 44551,21939 44551,21938 44555,21938 44558,21938 44559,21941 44559,21945 44558,19945 44562,19942 44560,19943 44561,19939 44565,19940 44561,19939 44556,19935 44557,9770 19466,9773 19471,9775 19471,9770 19471,9770 19468,9770 19467,9772 19466,9772 19468,9774 19469,9775 19472,12775 19470,12773 19466,12773 19467,12773 19464,12773 19466,12776 19461,12779 19461,12779 19465,12780 19465,12782 19460,12781 19458,12776 19461,12776 19461,12777 19463,12778 19466,12776 19466,12780 19463,12780 19466,12785 19468,12789 19473,12788 19477,12793 19475,12798 19480,12802 19482,12803 24482,12802 24484,16802 24486,16806 28486,16808 28486,16812 28490,16812 28494,16815 28498,16816 28498,16818 28502,16818 28504,16819 28509,19819 28513,19819 28510,19821 28515,19816 28510,19811 28510,19811 28511,19809 28511,19810 28510,19813 28515,22813 28510,22818 28514,22818 28515,22815 28516,22818 28514,22819 28514)',')'))); @@ -391,7 +390,6 @@ check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; -SET GLOBAL innodb_file_per_table=default; create table t1(i int primary key, a geometry not null, b geometry not null, c int, diff --git a/mysql-test/suite/innodb_gis/r/rtree_compress2.result b/mysql-test/suite/innodb_gis/r/rtree_compress2.result index 503be08c66f..bfd1bdb136f 100644 --- a/mysql-test/suite/innodb_gis/r/rtree_compress2.result +++ b/mysql-test/suite/innodb_gis/r/rtree_compress2.result @@ -1,4 +1,3 @@ -SET GLOBAL innodb_file_per_table=1; create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED; create procedure insert_t1(IN total int) begin diff --git a/mysql-test/suite/innodb_gis/t/rollback.test b/mysql-test/suite/innodb_gis/t/rollback.test index fcfe71e2f80..06be872c7b8 100644 --- a/mysql-test/suite/innodb_gis/t/rollback.test +++ b/mysql-test/suite/innodb_gis/t/rollback.test @@ -411,13 +411,6 @@ rollback; DROP TABLE t4; -# Test externally stored update rollback. -LET $file_per_table='on'; - ---disable_warnings -eval SET GLOBAL innodb_file_per_table=$file_per_table; ---enable_warnings - create table t1(i int primary key, a geometry not null, spatial index(a)) row_format=dynamic engine=innodb; @@ -437,10 +430,6 @@ check table t1; drop table t1; ---disable_warnings -SET GLOBAL innodb_file_per_table=default; ---enable_warnings - # Test partial update rollback. create table t1(i int primary key, a geometry not null, b geometry not null, diff --git a/mysql-test/suite/innodb_gis/t/rtree_compress2.test b/mysql-test/suite/innodb_gis/t/rtree_compress2.test index 051fcfcac46..9cd75f6ee2d 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_compress2.test +++ b/mysql-test/suite/innodb_gis/t/rtree_compress2.test @@ -10,8 +10,6 @@ --source include/not_valgrind.inc let $restart_noprint=2; -SET GLOBAL innodb_file_per_table=1; - # Create table with R-tree index. create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED; diff --git a/mysql-test/suite/innodb_zip/r/create_options.result b/mysql-test/suite/innodb_zip/r/create_options.result index 0f4c1239d73..d463601fbc0 100644 --- a/mysql-test/suite/innodb_zip/r/create_options.result +++ b/mysql-test/suite/innodb_zip/r/create_options.result @@ -274,107 +274,6 @@ Level Code Message ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; Level Code Message -# Test 8) StrictMode=ON, Make sure ROW_FORMAT=COMPRESSED -# and a valid non-zero KEY_BLOCK_SIZE are rejected with -# innodb_file_per_table=OFF and that they can be set to default -# values during strict mode. -SET GLOBAL innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=1; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=DYNAMIC -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Redundant row_format=REDUNDANT -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compact row_format=COMPACT -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; -SHOW WARNINGS; -Level Code Message -ALTER TABLE t1 KEY_BLOCK_SIZE=1; -ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'KEY_BLOCK_SIZE' -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1478 Table storage engine 'InnoDB' does not support the create option 'KEY_BLOCK_SIZE' -ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1478 Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=DYNAMIC -SHOW WARNINGS; -Level Code Message -ALTER TABLE t1 ROW_FORMAT=COMPACT; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compact row_format=COMPACT -ALTER TABLE t1 ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Redundant row_format=REDUNDANT -ALTER TABLE t1 ROW_FORMAT=DEFAULT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic -SET GLOBAL innodb_file_per_table=ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; -SET GLOBAL innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -Level Code Message -ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0; -SHOW WARNINGS; -Level Code Message -ALTER TABLE t1 ADD COLUMN f2 INT; -SHOW WARNINGS; -Level Code Message -SET GLOBAL innodb_file_per_table=ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -################################################## SET SESSION innodb_strict_mode = OFF; # Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0 # KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified' @@ -718,58 +617,5 @@ Level Code Message SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic row_format=DYNAMIC -# Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a -valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF -and then used again when innodb_file_per_table=ON. -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compressed row_format=COMPRESSED key_block_size=2 -SET GLOBAL innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compressed row_format=COMPRESSED key_block_size=2 -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 ADD COLUMN f2 INT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compressed row_format=COMPRESSED key_block_size=2 -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=DYNAMIC -SET GLOBAL innodb_file_per_table=OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=DYNAMIC -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 ADD COLUMN f2 INT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=DYNAMIC # Cleanup DROP TABLE t1; diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result index d1e7220b0ba..c4b7e75a71c 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result @@ -1,5 +1,4 @@ SET default_storage_engine=InnoDB; -set global innodb_file_per_table=1; ### Test 1 ### create table worklog5743(a TEXT not null, primary key (a(768))) ROW_FORMAT=DYNAMIC; show warnings; @@ -143,7 +142,7 @@ worklog5743_4 CREATE TABLE `worklog5743_4` ( `a1` int(11) DEFAULT NULL, `a2` text NOT NULL, KEY `idx1` (`a2`(1173)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=4 create index idx3 on worklog5743_4(a2(769)); show warnings; Level Code Message @@ -226,7 +225,7 @@ create index idx1 on worklog5743(a2); ERROR 42000: Specified key was too long; max key length is 1173 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 3072 bytes +Note 1071 Specified key was too long; max key length is 3072 bytes Error 1071 Specified key was too long; max key length is 1173 bytes drop table worklog5743; create table worklog5743(a1 int, a2 varchar(3072)) ROW_FORMAT=DYNAMIC; @@ -326,7 +325,7 @@ worklog5743 CREATE TABLE `worklog5743` ( `a` text NOT NULL, KEY `idx1` (`a`(769)), KEY `idx2` (`a`(768)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC insert into worklog5743 values(repeat("a", 768)); drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT; @@ -339,4 +338,3 @@ create index idx on worklog5743(a(768)); ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; -SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result index ef5b5984f3c..8eadb57816b 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result @@ -1,5 +1,4 @@ SET default_storage_engine=InnoDB; -set global innodb_file_per_table=1; ### Test 1 ### create table worklog5743(a TEXT not null, primary key (a(1000))) ROW_FORMAT=DYNAMIC; show warnings; @@ -362,7 +361,7 @@ worklog5743 CREATE TABLE `worklog5743` ( `a` text NOT NULL, KEY `idx1` (`a`(1536)), KEY `idx2` (`a`(1536)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT; create index idx on worklog5743(a(768)); @@ -374,4 +373,3 @@ create index idx on worklog5743(a(768)); ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; -SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_zip/r/innodb-zip.result b/mysql-test/suite/innodb_zip/r/innodb-zip.result index c44eefcbbb0..cf8375a2cd3 100644 --- a/mysql-test/suite/innodb_zip/r/innodb-zip.result +++ b/mysql-test/suite/innodb_zip/r/innodb-zip.result @@ -6,37 +6,7 @@ WHERE table_schema='mysqltest_innodb_zip'; table_name row_format data_length index_length SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; set session innodb_strict_mode=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 SET @@global.innodb_stats_on_metadata=ON; -create table t0(a int primary key) engine=innodb row_format=compressed; -Warnings: -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. -create table t00(a int primary key) engine=innodb -key_block_size=4 row_format=compressed; -Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4. -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. -create table t1(a int primary key) engine=innodb row_format=dynamic; -create table t2(a int primary key) engine=innodb row_format=redundant; -create table t3(a int primary key) engine=innodb row_format=compact; -create table t4(a int primary key) engine=innodb key_block_size=9; -Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. -create table t5(a int primary key) engine=innodb -key_block_size=1 row_format=redundant; -Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1. -set global innodb_file_per_table=on; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release create table t6(a int primary key) engine=innodb key_block_size=1 row_format=redundant; Warnings: @@ -69,37 +39,16 @@ Warnings: Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t0 Dynamic {valid} 0 -mysqltest_innodb_zip t00 Dynamic {valid} 0 -mysqltest_innodb_zip t1 Dynamic {valid} 0 mysqltest_innodb_zip t10 Dynamic {valid} 0 mysqltest_innodb_zip t11 Compressed 1024 0 mysqltest_innodb_zip t12 Compressed 1024 0 mysqltest_innodb_zip t13 Compressed {valid} 0 mysqltest_innodb_zip t14 Dynamic {valid} 0 -mysqltest_innodb_zip t2 Redundant {valid} 0 -mysqltest_innodb_zip t3 Compact {valid} 0 -mysqltest_innodb_zip t4 Dynamic {valid} 0 -mysqltest_innodb_zip t5 Redundant {valid} 0 mysqltest_innodb_zip t6 Redundant {valid} 0 mysqltest_innodb_zip t7 Redundant {valid} 0 mysqltest_innodb_zip t8 Dynamic {valid} 0 mysqltest_innodb_zip t9 Compact {valid} 0 -drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; -alter table t1 key_block_size=0; -alter table t1 row_format=dynamic; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; -table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t1 Dynamic {valid} 0 -alter table t1 row_format=compact; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; -table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t1 Compact {valid} 0 -alter table t1 row_format=redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; -table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t1 Redundant {valid} 0 -drop table t1; +drop table t6,t7,t8,t9,t10,t11,t12,t13,t14; create table t1(a int not null, b text, index(b(10))) engine=innodb key_block_size=1; create table t2(b text)engine=innodb; @@ -250,50 +199,5 @@ Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong cre Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length -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 (id int primary key) engine = innodb key_block_size = 1; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t2 (id int primary key) engine = innodb key_block_size = 2; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t3 (id int primary key) engine = innodb key_block_size = 4; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t6 (id int primary key) engine = innodb row_format = compressed; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t7 (id int primary key) engine = innodb row_format = dynamic; -show warnings; -Level Code Message -create table t8 (id int primary key) engine = innodb row_format = compact; -create table t9 (id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; -table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t7 Dynamic {valid} 0 -mysqltest_innodb_zip t8 Compact {valid} 0 -mysqltest_innodb_zip t9 Redundant {valid} 0 -drop table t7, t8, t9; -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 @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb_zip/r/large_blob.result b/mysql-test/suite/innodb_zip/r/large_blob.result index 55bb90aab5c..513978052d9 100644 --- a/mysql-test/suite/innodb_zip/r/large_blob.result +++ b/mysql-test/suite/innodb_zip/r/large_blob.result @@ -1,34 +1,6 @@ # # This tests the use of large blobs in InnoDB. # -SET GLOBAL innodb_file_per_table = OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -# -# System tablespace, Row Format = Redundant -# -CREATE TABLE t1 ( -c1 INT DEFAULT NULL, -c2 LONGBLOB NOT NULL, -KEY k2 (c2(250), c1) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT; -INSERT INTO t1 VALUES (1, ''); -UPDATE t1 SET c2=@longblob; -DROP TABLE t1; -# -# System tablespace, Row Format = Compact -# -CREATE TABLE t1 ( -c1 INT DEFAULT NULL, -c2 LONGBLOB NOT NULL, -KEY k2 (c2(250), c1) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT; -INSERT INTO t1 VALUES (1, ''); -UPDATE t1 SET c2=@longblob; -DROP TABLE t1; -SET GLOBAL innodb_file_per_table = ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release # # Separate tablespace, Row Format = Redundant # diff --git a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff index 0ba8a299ab9..75ca30c1eec 100644 --- a/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff +++ b/mysql-test/suite/innodb_zip/r/page_size,4k.rdiff @@ -233,25 +233,10 @@ SELECT table_name, row_format, create_options FROM information_schema.tables WHERE table_name = 't1'; table_name row_format create_options -@@ -272,6 +227,7 @@ - ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") - SHOW WARNINGS; - Level Code Message -+Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4. - Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. - Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") - Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -@@ -279,107 +235,13 @@ - ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") - SHOW WARNINGS; - Level Code Message -+Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4. - Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. - Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") - Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB - SET GLOBAL innodb_file_per_table = ON; - Warnings: - Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release +@@ -261,101 +216,6 @@ + t1 Compressed row_format=COMPRESSED + DROP TABLE t1; + SET SESSION innodb_strict_mode = ON; -# Test 7) This series of tests were moved from innodb-index to here -# because the second alter table t1 assumes a 16k page size. -# Moving the test allows the rest of innodb-index to be run on all @@ -350,7 +335,7 @@ # Test 8) Test creating a table that could lead to undo log overflow. CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob, h blob,i blob,j blob,k blob,l blob,m blob,n blob, -@@ -394,10 +256,6 @@ +@@ -370,10 +230,6 @@ UPDATE t1 SET a=@b,b=@b,c=@b,d=@b,e=@b,f=@b,g=@b,h=@b,i=@b,j=@b, k=@b,l=@b,m=@b,n=@b,o=@b,p=@b,q=@b,r=@b,s=@b,t=@b,u=@b; CREATE INDEX t1a ON t1 (a(767)); @@ -361,7 +346,7 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c; CREATE INDEX t1f ON t1 (f(767)); -@@ -412,37 +270,15 @@ +@@ -388,37 +244,15 @@ COMMIT; CREATE INDEX t1g ON t1 (g(767)); UPDATE t1 SET g=@e; @@ -403,7 +388,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( -@@ -468,28 +304,12 @@ +@@ -444,28 +278,12 @@ `t` blob DEFAULT NULL, `u` blob DEFAULT NULL, KEY `t1a` (`a`(767)), @@ -434,7 +419,7 @@ ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC DROP TABLE t1; # Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZE -@@ -574,27 +394,25 @@ +@@ -550,27 +368,25 @@ DROP TABLE t1; CREATE TABLE t1( c text NOT NULL, d text NOT NULL, diff --git a/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff b/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff index 0d215684e2f..cd16e2ad2eb 100644 --- a/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff +++ b/mysql-test/suite/innodb_zip/r/page_size,8k.rdiff @@ -211,17 +211,10 @@ SELECT table_name, row_format, create_options FROM information_schema.tables WHERE table_name = 't1'; table_name row_format create_options -@@ -279,107 +246,13 @@ - ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") - SHOW WARNINGS; - Level Code Message -+Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8. - Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. - Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") - Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB - SET GLOBAL innodb_file_per_table = ON; - Warnings: - Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release +@@ -261,101 +228,6 @@ + t1 Compressed row_format=COMPRESSED + DROP TABLE t1; + SET SESSION innodb_strict_mode = ON; -# Test 7) This series of tests were moved from innodb-index to here -# because the second alter table t1 assumes a 16k page size. -# Moving the test allows the rest of innodb-index to be run on all @@ -320,7 +313,7 @@ # Test 8) Test creating a table that could lead to undo log overflow. CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob, h blob,i blob,j blob,k blob,l blob,m blob,n blob, -@@ -394,10 +267,6 @@ +@@ -370,10 +242,6 @@ UPDATE t1 SET a=@b,b=@b,c=@b,d=@b,e=@b,f=@b,g=@b,h=@b,i=@b,j=@b, k=@b,l=@b,m=@b,n=@b,o=@b,p=@b,q=@b,r=@b,s=@b,t=@b,u=@b; CREATE INDEX t1a ON t1 (a(767)); @@ -331,7 +324,7 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c; CREATE INDEX t1f ON t1 (f(767)); -@@ -412,30 +281,6 @@ +@@ -388,30 +256,6 @@ COMMIT; CREATE INDEX t1g ON t1 (g(767)); UPDATE t1 SET g=@e; @@ -362,7 +355,7 @@ CREATE INDEX t1t ON t1 (t(767)); BEGIN; UPDATE t1 SET t=@e; -@@ -468,24 +313,8 @@ +@@ -444,24 +288,8 @@ `t` blob DEFAULT NULL, `u` blob DEFAULT NULL, KEY `t1a` (`a`(767)), @@ -387,7 +380,7 @@ KEY `t1t` (`t`(767)), KEY `t1u` (`u`(767)), KEY `t1ut` (`u`(767),`t`(767)), -@@ -577,14 +406,14 @@ +@@ -553,14 +381,14 @@ PRIMARY KEY (c(767),d(767))) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; Warnings: @@ -404,7 +397,7 @@ DROP TABLE t1; CREATE TABLE t1( c text NOT NULL, d text NOT NULL, -@@ -594,7 +423,7 @@ +@@ -570,7 +398,7 @@ CREATE TABLE t1(c text, PRIMARY KEY (c(440))) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII; Warnings: diff --git a/mysql-test/suite/innodb_zip/r/page_size.result b/mysql-test/suite/innodb_zip/r/page_size.result index 71e8e5461d3..64e6c631f75 100644 --- a/mysql-test/suite/innodb_zip/r/page_size.result +++ b/mysql-test/suite/innodb_zip/r/page_size.result @@ -260,31 +260,7 @@ FROM information_schema.tables WHERE table_name = 't1'; table_name row_format create_options t1 Compressed row_format=COMPRESSED DROP TABLE t1; -# Test 6) KEY_BLOCK_SIZE with innodb_file_per_table=OFF SET SESSION innodb_strict_mode = ON; -SET GLOBAL innodb_file_per_table = OFF; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SHOW VARIABLES LIKE 'innodb_file_per_table'; -Variable_name Value -innodb_file_per_table OFF -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SET GLOBAL innodb_file_per_table = ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release # Test 7) This series of tests were moved from innodb-index to here # because the second alter table t1 assumes a 16k page size. # Moving the test allows the rest of innodb-index to be run on all diff --git a/mysql-test/suite/innodb_zip/r/wl5522_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_zip.result index a7cc00cb1fd..6e9ef2775fc 100644 --- a/mysql-test/suite/innodb_zip/r/wl5522_zip.result +++ b/mysql-test/suite/innodb_zip/r/wl5522_zip.result @@ -262,28 +262,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_zip/t/create_options.test b/mysql-test/suite/innodb_zip/t/create_options.test index 9840a28a2ce..607cd342475 100644 --- a/mysql-test/suite/innodb_zip/t/create_options.test +++ b/mysql-test/suite/innodb_zip/t/create_options.test @@ -35,8 +35,6 @@ # 3) KEY_BLOCK_SIZE=0 can be used to set it to 'unspecified'. # 4) KEY_BLOCK_SIZE=1,2,4,8 & 16 are incompatible with COMPACT, DYNAMIC & # REDUNDANT. -# 5) KEY_BLOCK_SIZE=1,2,4,8 & 16 as well as ROW_FORMAT=COMPRESSED -# are incompatible with innodb_file_per_table=OFF # 6) KEY_BLOCK_SIZE on an ALTER must occur with ROW_FORMAT=COMPRESSED # or ROW_FORMAT=DEFAULT if the ROW_FORMAT was previously specified # as COMPACT, DYNAMIC or REDUNDANT. @@ -48,8 +46,6 @@ # 2. Ignore a bad ROW_FORMAT, defaulting to COMPACT. # 3. Ignore a valid KEY_BLOCK_SIZE when an incompatible but valid # ROW_FORMAT is specified. -# 4. If innodb_file_per_table=OFF -# it will ignore ROW_FORMAT=COMPRESSED and non-zero KEY_BLOCK_SIZEs. # # See InnoDB documentation page "SQL Compression Syntax Warnings and Errors" # This test case does not try to create tables with KEY_BLOCK_SIZE > 4 @@ -216,62 +212,6 @@ SHOW WARNINGS; ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; ---echo # Test 8) StrictMode=ON, Make sure ROW_FORMAT=COMPRESSED ---echo # and a valid non-zero KEY_BLOCK_SIZE are rejected with ---echo # innodb_file_per_table=OFF and that they can be set to default ---echo # values during strict mode. -SET GLOBAL innodb_file_per_table=OFF; -DROP TABLE t1; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=1; -SHOW WARNINGS; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED; -SHOW WARNINGS; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; -SHOW WARNINGS; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 KEY_BLOCK_SIZE=1; -SHOW WARNINGS; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -SHOW WARNINGS; -ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SHOW WARNINGS; -ALTER TABLE t1 ROW_FORMAT=COMPACT; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -ALTER TABLE t1 ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -ALTER TABLE t1 ROW_FORMAT=DEFAULT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_per_table=ON; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; -SET GLOBAL innodb_file_per_table=OFF; -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0; -SHOW WARNINGS; -ALTER TABLE t1 ADD COLUMN f2 INT; -SHOW WARNINGS; -SET GLOBAL innodb_file_per_table=ON; - ---echo ################################################## SET SESSION innodb_strict_mode = OFF; --echo # Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0 @@ -445,34 +385,5 @@ ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; ---echo # Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a ---echo valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF ---echo and then used again when innodb_file_per_table=ON. -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_per_table=OFF; -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_per_table=ON; -ALTER TABLE t1 ADD COLUMN f2 INT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_per_table=OFF; -ALTER TABLE t1 ADD COLUMN f1 INT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_per_table=ON; -ALTER TABLE t1 ADD COLUMN f2 INT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; - - --echo # Cleanup DROP TABLE t1; diff --git a/mysql-test/suite/innodb_zip/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test index 47867f3fa3e..14c8e3a3e5f 100644 --- a/mysql-test/suite/innodb_zip/t/innodb-zip.test +++ b/mysql-test/suite/innodb_zip/t/innodb-zip.test @@ -11,21 +11,8 @@ SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; --let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name set session innodb_strict_mode=0; -SET @save_fpt=@@GLOBAL.innodb_file_per_table; -set global innodb_file_per_table=off; SET @@global.innodb_stats_on_metadata=ON; -create table t0(a int primary key) engine=innodb row_format=compressed; -create table t00(a int primary key) engine=innodb -key_block_size=4 row_format=compressed; -create table t1(a int primary key) engine=innodb row_format=dynamic; -create table t2(a int primary key) engine=innodb row_format=redundant; -create table t3(a int primary key) engine=innodb row_format=compact; -create table t4(a int primary key) engine=innodb key_block_size=9; -create table t5(a int primary key) engine=innodb -key_block_size=1 row_format=redundant; - -set global innodb_file_per_table=on; create table t6(a int primary key) engine=innodb key_block_size=1 row_format=redundant; create table t7(a int primary key) engine=innodb @@ -47,18 +34,7 @@ create table t14(a int primary key) engine=innodb key_block_size=9; --replace_result 16384 {valid} 8192 {valid} 4096 {valid} 2048 {valid} --eval $query_i_s -drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; -alter table t1 key_block_size=0; -alter table t1 row_format=dynamic; ---replace_result 16384 {valid} 8192 {valid} 4096 {valid} ---eval $query_i_s -alter table t1 row_format=compact; ---replace_result 16384 {valid} 8192 {valid} 4096 {valid} ---eval $query_i_s -alter table t1 row_format=redundant; ---replace_result 16384 {valid} 8192 {valid} 4096 {valid} ---eval $query_i_s -drop table t1; +drop table t6,t7,t8,t9,t10,t11,t12,t13,t14; create table t1(a int not null, b text, index(b(10))) engine=innodb key_block_size=1; @@ -214,45 +190,10 @@ show warnings; --eval $query_i_s -#test valid values with innodb_file_per_table unset -set global innodb_file_per_table = off; - ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t1 (id int primary key) engine = innodb key_block_size = 1; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t2 (id int primary key) engine = innodb key_block_size = 2; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t3 (id int primary key) engine = innodb key_block_size = 4; -show warnings; - -# Tests for key_block_size = 8 and 16 were moved to innodb_16k, innodb_8k -# and innodb_4k since they get different warnings with smaller page sizes. - ---error ER_CANT_CREATE_TABLE -create table t6 (id int primary key) engine = innodb row_format = compressed; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; -create table t7 (id int primary key) engine = innodb row_format = dynamic; -show warnings; -create table t8 (id int primary key) engine = innodb row_format = compact; -create table t9 (id int primary key) engine = innodb row_format = redundant; - ---replace_result 16384 {valid} 8192 {valid} 4096 {valid} ---eval $query_i_s -drop table t7, t8, t9; - # # restore environment to the state it was before this test execution # -SET GLOBAL innodb_file_per_table=@save_fpt; SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb_zip/t/large_blob.test b/mysql-test/suite/innodb_zip/t/large_blob.test index d8163737a17..67b92b157ab 100644 --- a/mysql-test/suite/innodb_zip/t/large_blob.test +++ b/mysql-test/suite/innodb_zip/t/large_blob.test @@ -24,34 +24,6 @@ while ($1 > 1) set @longblob=repeat(@blob,200000); --enable_query_log -SET GLOBAL innodb_file_per_table = OFF; - ---echo # ---echo # System tablespace, Row Format = Redundant ---echo # -CREATE TABLE t1 ( - c1 INT DEFAULT NULL, - c2 LONGBLOB NOT NULL, - KEY k2 (c2(250), c1) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT; -INSERT INTO t1 VALUES (1, ''); -UPDATE t1 SET c2=@longblob; -DROP TABLE t1; - ---echo # ---echo # System tablespace, Row Format = Compact ---echo # -CREATE TABLE t1 ( - c1 INT DEFAULT NULL, - c2 LONGBLOB NOT NULL, - KEY k2 (c2(250), c1) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT; -INSERT INTO t1 VALUES (1, ''); -UPDATE t1 SET c2=@longblob; -DROP TABLE t1; - -SET GLOBAL innodb_file_per_table = ON; - --echo # --echo # Separate tablespace, Row Format = Redundant --echo # diff --git a/mysql-test/suite/innodb_zip/t/page_size.test b/mysql-test/suite/innodb_zip/t/page_size.test index 16d65a139cf..b99044e56d2 100644 --- a/mysql-test/suite/innodb_zip/t/page_size.test +++ b/mysql-test/suite/innodb_zip/t/page_size.test @@ -488,19 +488,7 @@ SELECT table_name, row_format, create_options FROM information_schema.tables WHERE table_name = 't1'; DROP TABLE t1; - ---echo # Test 6) KEY_BLOCK_SIZE with innodb_file_per_table=OFF -# Moved from innodb-zip.test SET SESSION innodb_strict_mode = ON; -SET GLOBAL innodb_file_per_table = OFF; -SHOW VARIABLES LIKE 'innodb_file_per_table'; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -SHOW WARNINGS; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -SHOW WARNINGS; -SET GLOBAL innodb_file_per_table = ON; if ($INNODB_PAGE_SIZE == 16384) { --echo # Test 7) This series of tests were moved from innodb-index to here diff --git a/mysql-test/suite/innodb_zip/t/wl5522_zip.test b/mysql-test/suite/innodb_zip/t/wl5522_zip.test index f223d36a6de..0ccd45cb00c 100644 --- a/mysql-test/suite/innodb_zip/t/wl5522_zip.test +++ b/mysql-test/suite/innodb_zip/t/wl5522_zip.test @@ -282,30 +282,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/mariabackup/mdev-14447.combinations b/mysql-test/suite/mariabackup/mdev-14447.combinations deleted file mode 100644 index 79e5f7836ed..00000000000 --- a/mysql-test/suite/mariabackup/mdev-14447.combinations +++ /dev/null @@ -1,5 +0,0 @@ -[crc32] ---innodb-checksum-algorithm=crc32 - -[full_crc32] ---innodb-checksum-algorithm=full_crc32 diff --git a/mysql-test/suite/mariabackup/mdev-14447.opt b/mysql-test/suite/mariabackup/mdev-14447.opt deleted file mode 100644 index 5ac67e950c4..00000000000 --- a/mysql-test/suite/mariabackup/mdev-14447.opt +++ /dev/null @@ -1 +0,0 @@ ---sequence --innodb-data-file-path=ibdata_first:3M;ibdata_second:1M:autoextend
\ No newline at end of file diff --git a/mysql-test/suite/mariabackup/mdev-14447.result b/mysql-test/suite/mariabackup/mdev-14447.result deleted file mode 100644 index 5db4693d75f..00000000000 --- a/mysql-test/suite/mariabackup/mdev-14447.result +++ /dev/null @@ -1,24 +0,0 @@ -call mtr.add_suppression("InnoDB: New log files created"); -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 varchar(40) PRIMARY KEY, b varchar(40), c varchar(40), d varchar(40), index(b,c,d)) ENGINE INNODB; -# Create full backup , modify table, then create incremental/differential backup -SET debug_dbug='+d,skip_page_checksum',foreign_key_checks=0,unique_checks=0; -BEGIN; -INSERT INTO t select uuid(), uuid(), uuid(), uuid() from seq_1_to_100000; -COMMIT; -SELECT count(*) FROM t; -count(*) -100000 -# Prepare full backup, apply incremental one -# Restore and check results -# shutdown server -# remove datadir -# xtrabackup move back -# restart server -# restart -SELECT count(*) FROM t; -count(*) -100000 -DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/mdev-14447.test b/mysql-test/suite/mariabackup/mdev-14447.test deleted file mode 100644 index 79a0d075897..00000000000 --- a/mysql-test/suite/mariabackup/mdev-14447.test +++ /dev/null @@ -1,51 +0,0 @@ ---source include/have_debug.inc -# This test is slow on buildbot. ---source include/big_test.inc -call mtr.add_suppression("InnoDB: New log files created"); - -let $basedir=$MYSQLTEST_VARDIR/tmp/backup; -let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1; - -SET GLOBAL innodb_file_per_table=0; -CREATE TABLE t(a varchar(40) PRIMARY KEY, b varchar(40), c varchar(40), d varchar(40), index(b,c,d)) ENGINE INNODB; - -echo # Create full backup , modify table, then create incremental/differential backup; ---disable_result_log -exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir; ---enable_result_log - -SET debug_dbug='+d,skip_page_checksum',foreign_key_checks=0,unique_checks=0; -BEGIN; -INSERT INTO t select uuid(), uuid(), uuid(), uuid() from seq_1_to_100000; -COMMIT; -SELECT count(*) FROM t; - -exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$incremental_dir --incremental-basedir=$basedir --dbug=+d,page_intermittent_checksum_mismatch; - ---disable_result_log -echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --prepare --verbose --target-dir=$basedir; - -exec $XTRABACKUP --prepare --verbose --target-dir=$basedir --incremental-dir=$incremental_dir ; - -echo # Restore and check results; -let $targetdir=$basedir; - -let $_datadir= `SELECT @@datadir`; -let $innodb_data_file_path=`SELECT @@innodb_data_file_path`; -echo # shutdown server; ---source include/shutdown_mysqld.inc -echo # remove datadir; -rmdir $_datadir; -echo # xtrabackup move back; -exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir "--innodb_data_file_path=$innodb_data_file_path" --target-dir=$targetdir; -echo # restart server; ---source include/start_mysqld.inc - ---enable_result_log -SELECT count(*) FROM t; -DROP TABLE t; - -# Cleanup -rmdir $basedir; -rmdir $incremental_dir; diff --git a/mysql-test/suite/parts/r/alter_data_directory_innodb.result b/mysql-test/suite/parts/r/alter_data_directory_innodb.result index e8f976372d6..6bdb156e963 100644 --- a/mysql-test/suite/parts/r/alter_data_directory_innodb.result +++ b/mysql-test/suite/parts/r/alter_data_directory_innodb.result @@ -38,10 +38,6 @@ t CREATE TABLE `t` ( PARTITION BY HASH (`a`) (PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB, PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB) -SET @TMP = @@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 ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE; Warnings: Warning 1280 Name 'pk' ignored for PRIMARY key. @@ -54,9 +50,6 @@ t CREATE TABLE `t` ( PARTITION BY HASH (`a`) (PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB, PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB) -SET GLOBAL INNODB_FILE_PER_TABLE=@TMP; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release ALTER TABLE t REORGANIZE PARTITION p1,p2 INTO ( PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB diff --git a/mysql-test/suite/parts/r/longname.result b/mysql-test/suite/parts/r/longname.result index 8524eb8499d..4461850ec63 100644 --- a/mysql-test/suite/parts/r/longname.result +++ b/mysql-test/suite/parts/r/longname.result @@ -29,47 +29,9 @@ SUBPARTITIONS 2 ( PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); ERROR HY000: The path specified for @0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@0n@... is too long -SET @file_per_table=@@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 TABLE mysqltest1.t1 (a INT) ENGINE=INNODB -PARTITION BY RANGE (a) SUBPARTITION BY HASH(a) -(PARTITION `$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$` - VALUES LESS THAN (10) -(SUBPARTITION -`--------------------------abcdef0123456789abcdef0123456789abcdef`, -SUBPARTITION -`0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef`) -); -SET GLOBAL innodb_file_per_table=@file_per_table; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SHOW CREATE TABLE mysqltest1.t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci - PARTITION BY RANGE (`a`) -SUBPARTITION BY HASH (`a`) -(PARTITION `$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$` VALUES LESS THAN (10) - (SUBPARTITION `--------------------------abcdef0123456789abcdef0123456789abcdef` ENGINE = InnoDB, - SUBPARTITION `0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef` ENGINE = InnoDB)) -INSERT INTO mysqltest1.t1 VALUES(1); -DROP TABLE mysqltest1.`#mysql50#t1#P#@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024#SP#0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef`; -ERROR 42000: Incorrect table name '#mysql50#t1#P#@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@' -ALTER TABLE mysqltest1.t1 ADD FOREIGN KEY (a) REFERENCES -mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890; -ERROR HY000: Partitioned tables do not support FOREIGN KEY -ALTER TABLE -mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 -ADD FOREIGN KEY (a) REFERENCES mysqltest1.t1; -ERROR HY000: Partitioned tables do not support FOREIGN KEY SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'mysqltest1%'; NAME -mysqltest1/t1#P#@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024#SP#0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef -mysqltest1/t1#P#@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024#SP#@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002d@002dabcdef0123456789abcdef0123456789abcdef mysqltest1/test_jfg_table_name_with_64_chars_123456789012345678901234567890#P#pmax#SP#pmaxsp0 mysqltest1/test_jfg_table_name_with_64_chars_123456789012345678901234567890#P#pmax#SP#pmaxsp1 mysqltest1/test_jfg_table_name_with_64_chars_123456789012345678901234567890#P#test_jfg_partition_name_with_60_chars_1234567890123456789012#SP#test_jfg_partition_name_with_60_chars_1234567890123456789012sp0 diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result index 6d361bb1465..af46aa3dde1 100644 --- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result @@ -1,32 +1,7 @@ # # Verify that the DATA/INDEX DIR is stored and used if ALTER to MyISAM. # -SET @file_per_table= @@GLOBAL.innodb_file_per_table; SET @strict_mode= @@SESSION.innodb_strict_mode; -SET SESSION innodb_strict_mode = ON; -# -# InnoDB only supports DATA DIRECTORY with innodb_file_per_table=ON -# -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 (c1 INT) ENGINE = InnoDB -PARTITION BY HASH (c1) ( -PARTITION p0 -DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' - INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir', -PARTITION p1 -DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' - INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' -); -ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table. -Warning 1478 InnoDB: INDEX DIRECTORY is not supported -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -Error 6 Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 "No such file or directory") # # InnoDB is different from MyISAM in that it uses a text file # with an '.isl' extension instead of a symbolic link so that @@ -37,9 +12,6 @@ Error 6 Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 "No such fil # and it is no longer part of the definition. # SET SESSION innodb_strict_mode = OFF; -SET GLOBAL innodb_file_per_table = ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release CREATE TABLE t1 (c1 INT) ENGINE = InnoDB PARTITION BY HASH (c1) (PARTITION p0 @@ -137,9 +109,6 @@ DROP TABLE t1; # MDEV-14611 ALTER TABLE EXCHANGE PARTITION does not work # properly when used with DATA DIRECTORY # -SET GLOBAL innodb_file_per_table = ON; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release CREATE TABLE t1 ( myid INT(11) NOT NULL, @@ -331,7 +300,4 @@ DROP TABLE t1, t2; # # Cleanup # -SET GLOBAL innodb_file_per_table=@file_per_table; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SET SESSION innodb_strict_mode=@strict_mode; diff --git a/mysql-test/suite/parts/r/reorganize_partition_innodb.result b/mysql-test/suite/parts/r/reorganize_partition_innodb.result index b2233781219..a74c54ccb6a 100644 --- a/mysql-test/suite/parts/r/reorganize_partition_innodb.result +++ b/mysql-test/suite/parts/r/reorganize_partition_innodb.result @@ -38,10 +38,6 @@ t CREATE TABLE `t` ( PARTITION BY HASH (`a`) (PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB, PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB) -SET @TMP = @@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 ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE; Warnings: Warning 1280 Name 'pk' ignored for PRIMARY key. @@ -54,9 +50,6 @@ t CREATE TABLE `t` ( PARTITION BY HASH (`a`) (PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB, PARTITION `p2` DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_here' ENGINE = InnoDB) -SET GLOBAL INNODB_FILE_PER_TABLE=@TMP; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release ALTER TABLE t REORGANIZE PARTITION p1,p2 INTO ( PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp/partitions_somewhere_else/' ENGINE = INNODB diff --git a/mysql-test/suite/parts/t/alter_data_directory_innodb.test b/mysql-test/suite/parts/t/alter_data_directory_innodb.test index def04e14173..da47278033d 100644 --- a/mysql-test/suite/parts/t/alter_data_directory_innodb.test +++ b/mysql-test/suite/parts/t/alter_data_directory_innodb.test @@ -26,12 +26,9 @@ SHOW CREATE TABLE t; ALTER TABLE t DROP PRIMARY KEY, ALGORITHM=COPY; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR SHOW CREATE TABLE t; -SET @TMP = @@GLOBAL.INNODB_FILE_PER_TABLE; -SET GLOBAL INNODB_FILE_PER_TABLE=OFF; ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR SHOW CREATE TABLE t; -SET GLOBAL INNODB_FILE_PER_TABLE=@TMP; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval ALTER TABLE t REORGANIZE PARTITION p1,p2 INTO ( diff --git a/mysql-test/suite/parts/t/debug_innodb_fail-master.opt b/mysql-test/suite/parts/t/debug_innodb_fail-master.opt index 8f8c9e5f588..f83eb51b119 100644 --- a/mysql-test/suite/parts/t/debug_innodb_fail-master.opt +++ b/mysql-test/suite/parts/t/debug_innodb_fail-master.opt @@ -1 +1 @@ ---loose-innodb-file-per-table=1 --loose-innodb-buffer-pool-size=32M +--loose-innodb-buffer-pool-size=32M diff --git a/mysql-test/suite/parts/t/longname.test b/mysql-test/suite/parts/t/longname.test index ab6137d56dd..9f91ec9c649 100644 --- a/mysql-test/suite/parts/t/longname.test +++ b/mysql-test/suite/parts/t/longname.test @@ -31,35 +31,6 @@ PARTITION BY RANGE ( id ) PARTITION çççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç VALUES LESS THAN (1000) ENGINE = InnoDB, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB); -SET @file_per_table=@@GLOBAL.innodb_file_per_table; -SET GLOBAL innodb_file_per_table=0; - -CREATE TABLE mysqltest1.t1 (a INT) ENGINE=INNODB -PARTITION BY RANGE (a) SUBPARTITION BY HASH(a) -(PARTITION `$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$` - VALUES LESS THAN (10) - (SUBPARTITION - `--------------------------abcdef0123456789abcdef0123456789abcdef`, - SUBPARTITION - `0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef`) -); - -SET GLOBAL innodb_file_per_table=@file_per_table; - -SHOW CREATE TABLE mysqltest1.t1; -INSERT INTO mysqltest1.t1 VALUES(1); - ---error ER_WRONG_TABLE_NAME -DROP TABLE mysqltest1.`#mysql50#t1#P#@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024@0024#SP#0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef`; - ---error ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING -ALTER TABLE mysqltest1.t1 ADD FOREIGN KEY (a) REFERENCES -mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890; ---error ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING -ALTER TABLE -mysqltest1.test_jfg_table_name_with_64_chars_123456789012345678901234567890 -ADD FOREIGN KEY (a) REFERENCES mysqltest1.t1; - SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'mysqltest1%'; diff --git a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test index c0e3c21a12d..83365f90cfa 100644 --- a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test +++ b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test @@ -42,32 +42,11 @@ let $MYSQLD_DATADIR= `select @@datadir`; # These values can change during the test -SET @file_per_table= @@GLOBAL.innodb_file_per_table; SET @strict_mode= @@SESSION.innodb_strict_mode; --mkdir $MYSQLTEST_VARDIR/mysql-test-data-dir --mkdir $MYSQLTEST_VARDIR/mysql-test-idx-dir -SET SESSION innodb_strict_mode = ON; - ---echo # ---echo # InnoDB only supports DATA DIRECTORY with innodb_file_per_table=ON ---echo # -SET GLOBAL innodb_file_per_table = OFF; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---error ER_CANT_CREATE_TABLE -eval CREATE TABLE t1 (c1 INT) ENGINE = InnoDB -PARTITION BY HASH (c1) ( - PARTITION p0 - DATA DIRECTORY = '$MYSQLTEST_VARDIR/mysql-test-data-dir' - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/mysql-test-idx-dir', - PARTITION p1 - DATA DIRECTORY = '$MYSQLTEST_VARDIR/mysql-test-data-dir' - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/mysql-test-idx-dir' -); ---replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR -SHOW WARNINGS; - --echo # --echo # InnoDB is different from MyISAM in that it uses a text file --echo # with an '.isl' extension instead of a symbolic link so that @@ -78,7 +57,6 @@ SHOW WARNINGS; --echo # and it is no longer part of the definition. --echo # SET SESSION innodb_strict_mode = OFF; -SET GLOBAL innodb_file_per_table = ON; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval CREATE TABLE t1 (c1 INT) ENGINE = InnoDB PARTITION BY HASH (c1) @@ -146,7 +124,6 @@ DROP TABLE t1; --echo # let $data_dir_path= $MYSQLTEST_VARDIR/mysql-test-data-dir; let $alt_data_dir_path= $MYSQLTEST_VARDIR/mysql-test-idx-dir; -SET GLOBAL innodb_file_per_table = ON; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval CREATE TABLE t1 ( @@ -289,5 +266,4 @@ DROP TABLE t1, t2; --rmdir $MYSQLTEST_VARDIR/mysql-test-data-dir --rmdir $MYSQLTEST_VARDIR/mysql-test-idx-dir -SET GLOBAL innodb_file_per_table=@file_per_table; SET SESSION innodb_strict_mode=@strict_mode; diff --git a/mysql-test/suite/parts/t/partition_debug_innodb-master.opt b/mysql-test/suite/parts/t/partition_debug_innodb-master.opt index b7f94e14e12..d8813652cd6 100644 --- a/mysql-test/suite/parts/t/partition_debug_innodb-master.opt +++ b/mysql-test/suite/parts/t/partition_debug_innodb-master.opt @@ -1 +1 @@ ---loose-innodb-file-per-table=1 --loose-skip-stack-trace --skip-core-file --loose-innodb-buffer-pool-size=32M +--loose-skip-stack-trace --skip-core-file --loose-innodb-buffer-pool-size=32M diff --git a/mysql-test/suite/parts/t/reorganize_partition_innodb.test b/mysql-test/suite/parts/t/reorganize_partition_innodb.test index 77109c38c96..5e6150ea959 100644 --- a/mysql-test/suite/parts/t/reorganize_partition_innodb.test +++ b/mysql-test/suite/parts/t/reorganize_partition_innodb.test @@ -26,12 +26,9 @@ SHOW CREATE TABLE t; ALTER TABLE t DROP PRIMARY KEY, ALGORITHM=COPY; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR SHOW CREATE TABLE t; -SET @TMP = @@GLOBAL.INNODB_FILE_PER_TABLE; -SET GLOBAL INNODB_FILE_PER_TABLE=OFF; ALTER TABLE t ADD PRIMARY KEY pk(a), ALGORITHM=INPLACE; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR SHOW CREATE TABLE t; -SET GLOBAL INNODB_FILE_PER_TABLE=@TMP; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval ALTER TABLE t REORGANIZE PARTITION p1,p2 INTO ( diff --git a/mysql-test/suite/perfschema/t/show_sanity.test b/mysql-test/suite/perfschema/t/show_sanity.test index 3ca88b556f8..524718d80d5 100644 --- a/mysql-test/suite/perfschema/t/show_sanity.test +++ b/mysql-test/suite/perfschema/t/show_sanity.test @@ -416,7 +416,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DISABLE_SORT_FILE_CACHE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DOUBLEWRITE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FAST_SHUTDOWN"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FILE_PER_TABLE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FILL_FACTOR"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FIL_MAKE_PAGE_DIRTY_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSHING_AVG_LOOPS"), diff --git a/mysql-test/suite/rpl/t/rpl_sync-master.opt b/mysql-test/suite/rpl/t/rpl_sync-master.opt index 04b06bfa0f2..96f0ce3f36c 100644 --- a/mysql-test/suite/rpl/t/rpl_sync-master.opt +++ b/mysql-test/suite/rpl/t/rpl_sync-master.opt @@ -1,2 +1 @@ --default-storage-engine=MyISAM ---loose-innodb-file-per-table=0 diff --git a/mysql-test/suite/rpl/t/rpl_sync-slave.opt b/mysql-test/suite/rpl/t/rpl_sync-slave.opt index fc56065731c..05b25c8ac4b 100644 --- a/mysql-test/suite/rpl/t/rpl_sync-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_sync-slave.opt @@ -1,2 +1,2 @@ ---sync-relay-log-info=1 --relay-log-recovery=1 --default-storage-engine=MyISAM --loose-innodb-file-per-table=0 +--sync-relay-log-info=1 --relay-log-recovery=1 --default-storage-engine=MyISAM --skip-core-file diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 1899da28320..d656275643f 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -1,8 +1,7 @@ # # IMPORT / DISCARD TABLESPACE # -# The test might require additional engine options, -# e.g. for InnoDB it is --innodb-file-per-table +# The test might require additional engine options --source have_engine.inc diff --git a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result deleted file mode 100644 index 9d7555335a7..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result +++ /dev/null @@ -1,79 +0,0 @@ -SET @start_global_value = @@global.innodb_file_per_table; -SELECT @start_global_value; -@start_global_value -1 -'#---------------------BS_STVARS_028_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_file_per_table); -COUNT(@@GLOBAL.innodb_file_per_table) -1 -1 Expected -'#---------------------BS_STVARS_028_02----------------------#' -SET @@global.innodb_file_per_table = 0; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SELECT @@global.innodb_file_per_table; -@@global.innodb_file_per_table -0 -SET @@global.innodb_file_per_table ='On' ; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SELECT @@global.innodb_file_per_table; -@@global.innodb_file_per_table -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 -SELECT @@global.innodb_file_per_table; -@@global.innodb_file_per_table -0 -SET @@global.innodb_file_per_table = 1; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SELECT @@global.innodb_file_per_table; -@@global.innodb_file_per_table -1 -'#---------------------BS_STVARS_028_03----------------------#' -SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_per_table'; -IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_file_per_table); -COUNT(@@GLOBAL.innodb_file_per_table) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_per_table'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -'#---------------------BS_STVARS_028_04----------------------#' -SELECT @@innodb_file_per_table = @@GLOBAL.innodb_file_per_table; -@@innodb_file_per_table = @@GLOBAL.innodb_file_per_table -1 -1 Expected -'#---------------------BS_STVARS_028_05----------------------#' -SELECT COUNT(@@innodb_file_per_table); -COUNT(@@innodb_file_per_table) -1 -1 Expected -SELECT COUNT(@@local.innodb_file_per_table); -ERROR HY000: Variable 'innodb_file_per_table' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_file_per_table); -ERROR HY000: Variable 'innodb_file_per_table' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_file_per_table); -COUNT(@@GLOBAL.innodb_file_per_table) -1 -1 Expected -SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; -ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list' -SET @@global.innodb_file_per_table = @start_global_value; -Warnings: -Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release -SELECT @@global.innodb_file_per_table; -@@global.innodb_file_per_table -1 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 79341b85822..46e7e205954 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -607,18 +607,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_FILE_PER_TABLE -SESSION_VALUE NULL -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Stores each InnoDB table to an .ibd file in the database dir. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT NONE VARIABLE_NAME INNODB_FILL_FACTOR SESSION_VALUE NULL DEFAULT_VALUE 100 diff --git a/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt deleted file mode 100644 index 9d2c4f807e0..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb_file_per_table=On diff --git a/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test deleted file mode 100644 index 2fd9783e16d..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test +++ /dev/null @@ -1,116 +0,0 @@ - - -################## mysql-test\t\innodb_file_per_table_basic.test ############## -# # -# Variable Name: innodb_file_per_table # -# Scope: Global # -# Access Type: Dynamic # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable innodb_file_per_table # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_file_per_table; -SELECT @start_global_value; - - ---echo '#---------------------BS_STVARS_028_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.innodb_file_per_table); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_028_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - -SET @@global.innodb_file_per_table = 0; -SELECT @@global.innodb_file_per_table; - -SET @@global.innodb_file_per_table ='On' ; -SELECT @@global.innodb_file_per_table; - -SET @@global.innodb_file_per_table ='Off' ; -SELECT @@global.innodb_file_per_table; - -SET @@global.innodb_file_per_table = 1; -SELECT @@global.innodb_file_per_table; - ---echo '#---------------------BS_STVARS_028_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - ---disable_warnings -SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_per_table'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_file_per_table); ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_per_table'; ---enable_warnings ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_028_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@innodb_file_per_table = @@GLOBAL.innodb_file_per_table; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_028_05----------------------#' -################################################################################ -# Check if innodb_file_per_table can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@innodb_file_per_table); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_file_per_table); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_file_per_table); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_file_per_table); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; - -# -# Cleanup -# - -SET @@global.innodb_file_per_table = @start_global_value; -SELECT @@global.innodb_file_per_table; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d7543d86ec1..5788584b847 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5303,6 +5303,7 @@ static int init_server_components() MARIADB_REMOVED_OPTION("innodb-commit-concurrency"), MARIADB_REMOVED_OPTION("innodb-concurrency-tickets"), MARIADB_REMOVED_OPTION("innodb-file-format"), + MARIADB_REMOVED_OPTION("innodb-file-per-table"), MARIADB_REMOVED_OPTION("innodb-large-prefix"), MARIADB_REMOVED_OPTION("innodb-lock-schedule-algorithm"), MARIADB_REMOVED_OPTION("innodb-log-checksums"), diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index cce5f2f24d0..557a7e1c121 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -1395,9 +1395,6 @@ dberr_t dict_sys_t::create_or_check_sys_tables() made a mistake and defined table names and the foreign key id to be of type CHAR (internally, really VARCHAR). The type should have been VARBINARY. */ - /* System tables are always created inside the system tablespace. */ - const auto srv_file_per_table_backup= srv_file_per_table; - srv_file_per_table= 0; dberr_t error; span<const char> tablename; @@ -1425,7 +1422,6 @@ err_exit: trx->rollback(); row_mysql_unlock_data_dictionary(trx); trx->free(); - srv_file_per_table= srv_file_per_table_backup; return error; } } @@ -1464,7 +1460,6 @@ err_exit: trx->commit(); row_mysql_unlock_data_dictionary(trx); trx->free(); - srv_file_per_table= srv_file_per_table_backup; lock(SRW_LOCK_CALL); if (sys_foreign); diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 86792c2680f..bbaa274f38c 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1189,7 +1189,7 @@ void fil_space_t::close() mysql_mutex_unlock(&fil_system.mutex); } -void fil_system_t::create(ulint hash_size) +void fil_system_t::create() { ut_ad(this == &fil_system); ut_ad(!is_initialised()); @@ -1202,11 +1202,9 @@ void fil_system_t::create(ulint hash_size) compile_time_assert(!(UNIV_PAGE_SIZE_MAX % FSP_EXTENT_SIZE_MAX)); compile_time_assert(!(UNIV_PAGE_SIZE_MIN % FSP_EXTENT_SIZE_MIN)); - ut_ad(hash_size > 0); - mysql_mutex_init(fil_system_mutex_key, &mutex, nullptr); - spaces.create(hash_size); + spaces.create(50000); fil_space_crypt_init(); #ifdef __linux__ diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ee647430098..8128fc1aeda 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3934,7 +3934,7 @@ static int innodb_init_params() if (innobase_open_files < 10) { innobase_open_files = 300; - if (srv_file_per_table && tc_size > 300 && tc_size < open_files_limit) { + if (tc_size > 300 && tc_size < open_files_limit) { innobase_open_files = tc_size; } } @@ -5195,7 +5195,6 @@ create_table_info_t::create_table_info_t( HA_CREATE_INFO* create_info, char* table_name, char* remote_path, - bool file_per_table, trx_t* trx) : m_thd(thd), m_trx(trx), @@ -5204,7 +5203,10 @@ create_table_info_t::create_table_info_t( m_create_info(create_info), m_table_name(table_name), m_table(NULL), m_remote_path(remote_path), - m_innodb_file_per_table(file_per_table) + m_use_data_dir(!m_create_info->tmp_table() + && m_create_info->data_file_name + && m_create_info->data_file_name[0] + && my_use_symdir) { } @@ -10989,16 +10991,6 @@ create_table_info_t::create_option_data_directory_is_valid() ut_ad(m_create_info->data_file_name && m_create_info->data_file_name[0] != '\0'); - /* Use DATA DIRECTORY only with file-per-table. */ - if (!m_allow_file_per_table) { - push_warning( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: DATA DIRECTORY requires" - " innodb_file_per_table."); - is_valid = false; - } - /* Do not use DATA DIRECTORY with TEMPORARY TABLE. */ if (m_create_info->tmp_table()) { push_warning( @@ -11069,16 +11061,6 @@ create_table_info_t::create_options_are_invalid() kbs_max); ret = "KEY_BLOCK_SIZE"; } - - /* Valid KEY_BLOCK_SIZE, check its dependencies. */ - if (!m_allow_file_per_table) { - push_warning( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE requires" - " innodb_file_per_table."); - ret = "KEY_BLOCK_SIZE"; - } break; default: push_warning_printf( @@ -11100,15 +11082,6 @@ create_table_info_t::create_options_are_invalid() my_error(ER_UNSUPPORTED_COMPRESSED_TABLE, MYF(0)); return("ROW_FORMAT"); } - if (!m_allow_file_per_table) { - push_warning_printf( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s requires" - " innodb_file_per_table.", - get_row_format_name(row_format)); - ret = "ROW_FORMAT"; - } break; case ROW_TYPE_DYNAMIC: case ROW_TYPE_COMPACT: @@ -11236,15 +11209,6 @@ create_table_info_t::check_table_options() } } - if (!m_allow_file_per_table - && options->encryption != FIL_ENCRYPTION_DEFAULT) { - push_warning( - m_thd, Sql_condition::WARN_LEVEL_WARN, - HA_WRONG_CREATE_OPTION, - "InnoDB: ENCRYPTED requires innodb_file_per_table"); - return "ENCRYPTED"; - } - /* Check page compression requirements */ if (options->page_compressed) { @@ -11275,15 +11239,6 @@ create_table_info_t::check_table_options() return "PAGE_COMPRESSED"; } - if (!m_allow_file_per_table) { - push_warning( - m_thd, Sql_condition::WARN_LEVEL_WARN, - HA_WRONG_CREATE_OPTION, - "InnoDB: PAGE_COMPRESSED requires" - " innodb_file_per_table."); - return "PAGE_COMPRESSED"; - } - if (m_create_info->key_block_size) { push_warning( m_thd, Sql_condition::WARN_LEVEL_WARN, @@ -11390,15 +11345,14 @@ create_table_info_t::parse_table_name( 1. <database_name>/<table_name>: for normal table creation 2. full path: for temp table creation, or DATA DIRECTORY. - When srv_file_per_table is on and mysqld_embedded is off, + When mysqld_embedded is off, check for full path pattern, i.e. X:\dir\..., X is a driver letter, or \\dir1\dir2\..., UNC path returns error if it is in full path format, but not creating a temp. table. Currently InnoDB does not support symbolic link on Windows. */ - if (m_innodb_file_per_table - && !mysqld_embedded + if (!mysqld_embedded && !m_create_info->tmp_table()) { if ((name[1] == ':') @@ -11539,13 +11493,6 @@ index_bad: "InnoDB: KEY_BLOCK_SIZE is ignored" " for TEMPORARY TABLE."); zip_allowed = false; - } else if (!m_allow_file_per_table) { - push_warning( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE requires" - " innodb_file_per_table."); - zip_allowed = false; } if (!zip_allowed @@ -11607,12 +11554,6 @@ index_bad: "InnoDB: ROW_FORMAT=%s is ignored for" " TEMPORARY TABLE.", get_row_format_name(row_type)); - } else if (!m_allow_file_per_table) { - push_warning_printf( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=COMPRESSED requires" - " innodb_file_per_table."); } else { innodb_row_format = REC_FORMAT_COMPRESSED; break; @@ -11658,9 +11599,7 @@ index_bad: if (is_temp) { m_flags2 |= DICT_TF2_TEMPORARY; } else { - if (m_use_file_per_table) { - m_flags2 |= DICT_TF2_USE_FILE_PER_TABLE; - } + m_flags2 |= DICT_TF2_USE_FILE_PER_TABLE; level = ulint(options->page_compression_level); if (!level) { @@ -11864,32 +11803,6 @@ innobase_parse_hint_from_comment( } } -/** Set m_use_* flags. */ -void -create_table_info_t::set_tablespace_type( - bool table_being_altered_is_file_per_table) -{ - /** Allow file_per_table for this table either because: - 1) the setting innodb_file_per_table=on, - 2) the table being altered is currently file_per_table */ - m_allow_file_per_table = - m_innodb_file_per_table - || table_being_altered_is_file_per_table; - - /* Ignore the current innodb-file-per-table setting if we are - creating a temporary table. */ - m_use_file_per_table = m_allow_file_per_table - && !m_create_info->tmp_table(); - - /* DATA DIRECTORY must have m_use_file_per_table but cannot be - used with TEMPORARY tables. */ - m_use_data_dir = - m_use_file_per_table - && m_create_info->data_file_name - && m_create_info->data_file_name[0] - && my_use_symdir; -} - /** Initialize the create_table_info_t object. @return error number */ int @@ -11952,8 +11865,6 @@ int create_table_info_t::prepare_create_table(const char* name, bool strict) ut_ad(m_thd != NULL); ut_ad(m_create_info != NULL); - set_tablespace_type(false); - normalize_table_name(m_table_name, name); /* Validate table options not handled by the SQL-parser */ @@ -13067,13 +12978,12 @@ create_table_info_t::allocate_trx() @param[in] name Table name, format: "db/table_name". @param[in] form Table format; columns and index information. @param[in] create_info Create info (including create statement string). -@param[in] file_per_table whether to create .ibd file @param[in,out] trx dictionary transaction, or NULL to create new @return error code @retval 0 on success */ int ha_innobase::create(const char *name, TABLE *form, HA_CREATE_INFO *create_info, - bool file_per_table, trx_t *trx= nullptr) + trx_t *trx= nullptr) { char norm_name[FN_REFLEN]; /* {database}/{tablename} */ char remote_path[FN_REFLEN]; /* Absolute path of table */ @@ -13084,7 +12994,7 @@ ha_innobase::create(const char *name, TABLE *form, HA_CREATE_INFO *create_info, table_share->table_type == TABLE_TYPE_NORMAL); create_table_info_t info(ha_thd(), form, create_info, norm_name, - remote_path, file_per_table, trx); + remote_path, trx); int error= info.initialize(); if (!error) @@ -13153,7 +13063,7 @@ ha_innobase::create(const char *name, TABLE *form, HA_CREATE_INFO *create_info, int ha_innobase::create(const char *name, TABLE *form, HA_CREATE_INFO *create_info) { - return create(name, form, create_info, srv_file_per_table); + return create(name, form, create_info, nullptr); } /*****************************************************************//** @@ -13726,7 +13636,7 @@ int ha_innobase::truncate() row_mysql_lock_data_dictionary(trx); ib_table->release(); dict_sys.remove(ib_table, false, true); - int err= create(ib_table->name.m_name, table, &info, true, trx); + int err= create(ib_table->name.m_name, table, &info, trx); row_mysql_unlock_data_dictionary(trx); ut_ad(!err); @@ -13859,8 +13769,7 @@ int ha_innobase::truncate() ib_table->release(); m_prebuilt->table= nullptr; - err= create(name, table, &info, dict_table_is_file_per_table(ib_table), - trx); + err= create(name, table, &info, trx); if (!err) { m_prebuilt->table->acquire(); @@ -18814,11 +18723,6 @@ static MYSQL_SYSVAR_UINT(fast_shutdown, srv_fast_shutdown, " values are 0, 1 (faster), 2 (crash-like), 3 (fastest clean).", fast_shutdown_validate, NULL, 1, 0, 3, 0); -static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table, - PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_DEPRECATED, - "Stores each InnoDB table to an .ibd file in the database dir.", - NULL, NULL, TRUE); - static MYSQL_SYSVAR_STR(ft_server_stopword_table, innobase_server_stopword_table, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC, "The user supplied stopword table name.", @@ -19692,7 +19596,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(fast_shutdown), MYSQL_SYSVAR(read_io_threads), MYSQL_SYSVAR(write_io_threads), - MYSQL_SYSVAR(file_per_table), MYSQL_SYSVAR(flush_log_at_timeout), MYSQL_SYSVAR(flush_log_at_trx_commit), MYSQL_SYSVAR(flush_method), diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 1f42bf180a8..928f5730f72 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -194,7 +194,6 @@ public: const char* name, TABLE* form, HA_CREATE_INFO* create_info, - bool file_per_table, trx_t* trx); int create( @@ -619,7 +618,7 @@ class create_table_info_t public: /** Constructor. Used in two ways: - - all but file_per_table is used, when creating the table. + - all are used, when creating the table. - all but name/path is used, when validating options and using flags. */ create_table_info_t( THD* thd, @@ -627,15 +626,11 @@ public: HA_CREATE_INFO* create_info, char* table_name, char* remote_path, - bool file_per_table, trx_t* trx = NULL); /** Initialize the object. */ int initialize(); - /** Set m_tablespace_type. */ - void set_tablespace_type(bool table_being_altered_is_file_per_table); - /** Create InnoDB foreign keys from MySQL alter_info. */ dberr_t create_foreign_keys(); @@ -746,21 +741,8 @@ private: /** Remote path (DATA DIRECTORY) or zero length-string */ char* m_remote_path; - /** Local copy of srv_file_per_table. */ - bool m_innodb_file_per_table; - - /** Allow file_per_table for this table either because: - 1) the setting innodb_file_per_table=on, - 2) it was explicitly requested by tablespace=innodb_file_per_table. - 3) the table being altered is currently file_per_table */ - bool m_allow_file_per_table; - - /** After all considerations, this shows whether we will actually - create a table and tablespace using file-per-table. */ - bool m_use_file_per_table; - /** Using DATA DIRECTORY */ - bool m_use_data_dir; + const bool m_use_data_dir; /** Table flags */ ulint m_flags; diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index f741fca7ae7..abc9a1753ca 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -6487,8 +6487,7 @@ prepare_inplace_alter_table_dict( new_clustered = (DICT_CLUSTERED & index_defs[0].ind_type) != 0; create_table_info_t info(ctx->prebuilt->trx->mysql_thd, altered_table, - ha_alter_info->create_info, NULL, NULL, - srv_file_per_table); + ha_alter_info->create_info, NULL, NULL); /* The primary index would be rebuilt if a FTS Doc ID column is to be added, and the primary index definition @@ -7826,19 +7825,11 @@ ha_innobase::prepare_inplace_alter_table( #endif indexed_table = m_prebuilt->table; - /* ALTER TABLE will not implicitly move a table from a single-table - tablespace to the system tablespace when innodb_file_per_table=OFF. - But it will implicitly move a table from the system tablespace to a - single-table tablespace if innodb_file_per_table = ON. */ - create_table_info_t info(m_user_thd, altered_table, ha_alter_info->create_info, NULL, - NULL, - srv_file_per_table); - - info.set_tablespace_type(indexed_table->space != fil_system.sys_space); + NULL); if (ha_alter_info->handler_flags & ALTER_ADD_NON_UNIQUE_NON_PRIM_INDEX) { if (info.gcols_in_fulltext_or_spatial()) { diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index bbbda57b05d..6263ee409d0 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -127,10 +127,7 @@ Secondary indexes are created from this external data using row_ext_t to cache the BLOB prefixes. */ #define DICT_TF_WIDTH_ATOMIC_BLOBS 1 -/** If a table is created with the MYSQL option DATA DIRECTORY and -innodb-file-per-table, an older engine will not be able to find that table. -This flag prevents older engines from attempting to open the table and -allows InnoDB to update_create_info() accordingly. */ +/** Whether the a table was the DATA DIRECTORY */ #define DICT_TF_WIDTH_DATA_DIR 1 /** diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 65ca704b6d8..e06a5f308a7 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1347,10 +1347,8 @@ struct fil_system_t /** Create the file system interface at database start. - - @param[in] hash_size hash table size */ - void create(ulint hash_size); + void create(); /** Close the file system interface at shutdown */ void close(); diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index f94c52c2d97..3f175449ca7 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -173,9 +173,6 @@ extern my_bool srv_read_only_mode; /** Set if innodb_read_only is set or innodb_force_recovery is SRV_FORCE_NO_UNDO_LOG_SCAN or greater. */ extern bool high_level_read_only; -/** store to its own file each table created by an user; data -dictionary tables are in the system tablespace 0 */ -extern my_bool srv_file_per_table; /** Sort buffer size in index creation */ extern ulong srv_sort_buf_size; diff --git a/storage/innobase/mysql-test/storage_engine/alter_tablespace.opt b/storage/innobase/mysql-test/storage_engine/alter_tablespace.opt deleted file mode 100644 index cf4b117e1b1..00000000000 --- a/storage/innobase/mysql-test/storage_engine/alter_tablespace.opt +++ /dev/null @@ -1,2 +0,0 @@ ---innodb-file-per-table=1 - diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 7c4e5a0d890..80347028aab 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -122,9 +122,6 @@ unsigned long long srv_max_undo_log_size; recovery and open all tables in RO mode instead of RW mode. We don't sync the max trx id to disk either. */ my_bool srv_read_only_mode; -/** store to its own file each table created by an user; data -dictionary tables are in the system tablespace 0 */ -my_bool srv_file_per_table; /** Set if innodb_read_only is set or innodb_force_recovery is SRV_FORCE_NO_UNDO_LOG_SCAN or greater. */ bool high_level_read_only; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 75116a0201a..cc0a36f0d8c 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1301,7 +1301,7 @@ dberr_t srv_start(bool create_new_db) } #endif - fil_system.create(srv_file_per_table ? 50000 : 5000); + fil_system.create(); ib::info() << "Initializing buffer pool, total size = " << ib::bytes_iec{srv_buf_pool_size} |