From 0b66d3f70d365bbb936aae4ca67892c17d68d241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 1 Dec 2016 12:56:23 +0200 Subject: MDEV-11426 Remove InnoDB INFORMATION_SCHEMA.FILES implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MySQL 5.7 introduced WL#7943: InnoDB: Implement Information_Schema.Files to provide a long-term alternative for accessing tablespace metadata. The INFORMATION_SCHEMA.INNODB_* views are considered internal interfaces that are subject to change or removal between releases. So, users should refer to I_S.FILES instead of I_S.INNODB_SYS_TABLESPACES to fetch metadata about CREATE TABLESPACE. Because MariaDB 10.2 does not support CREATE TABLESPACE or CREATE TABLE…TABLESPACE for InnoDB, it does not make sense to support I_S.FILES either. So, let MariaDB 10.2 omit the code that was added in MySQL 5.7. After this change, I_S.FILES will report the empty result, unless some other storage engine in MariaDB 10.2 implements the interface. (The I_S.FILES interface was originally created for the NDB Cluster.) --- mysql-test/suite/innodb_zip/t/restart.test | 32 ------------------------------ 1 file changed, 32 deletions(-) (limited to 'mysql-test/suite/innodb_zip/t/restart.test') diff --git a/mysql-test/suite/innodb_zip/t/restart.test b/mysql-test/suite/innodb_zip/t/restart.test index 354e63a69f7..a2dacdb4a05 100644 --- a/mysql-test/suite/innodb_zip/t/restart.test +++ b/mysql-test/suite/innodb_zip/t/restart.test @@ -152,29 +152,6 @@ INSERT INTO t7_restart (SELECT 0, c2, c3, c4, c5 FROM t7_restart); SHOW CREATE TABLE t7_restart; SELECT count(*) FROM t7_restart; ---echo # ---echo # Create and insert records into a table that uses a general tablespace. ---echo # -CREATE TABLESPACE s1_restart ADD DATAFILE 's1_restart.ibd'; -CREATE TABLE t8_restart(c1 DOUBLE AUTO_INCREMENT KEY, c2 CHAR(10), c3 VARCHAR(100), c4 DATE, c5 TEXT) - ROW_FORMAT=COMPACT ENGINE=InnoDB TABLESPACE=s1_restart; -INSERT INTO t8_restart VALUES (1000000000, 'MySQL', 'InnoDB', '2011-11-11', 'Read this after reboot'); -INSERT INTO t8_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t8_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t8_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t8_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -SHOW CREATE TABLE t8_restart; -SELECT count(*) FROM t8_restart; -CREATE TABLE t9_restart(c1 DOUBLE AUTO_INCREMENT KEY, c2 CHAR(10), c3 VARCHAR(100), c4 DATE, c5 TEXT) - ROW_FORMAT=DYNAMIC ENGINE=InnoDB TABLESPACE=s1_restart; -INSERT INTO t9_restart VALUES (1000000000, 'MySQL', 'InnoDB', '2011-11-11', 'Read this after reboot'); -INSERT INTO t9_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t9_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t9_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -INSERT INTO t9_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); -SHOW CREATE TABLE t9_restart; -SELECT count(*) FROM t9_restart; - --echo # --echo # Show these tables in information_schema. --echo # @@ -211,8 +188,6 @@ SHOW CREATE TABLE t5_restart; SHOW CREATE TABLE t6_restart; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SHOW CREATE TABLE t7_restart; -SHOW CREATE TABLE t8_restart; -SHOW CREATE TABLE t9_restart; INSERT INTO t1_restart (SELECT 0, c2, c3, c4, c5 FROM t1_restart); INSERT INTO t2_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart); @@ -221,8 +196,6 @@ INSERT INTO t4_restart (SELECT 0, c2, c3, c4, c5 FROM t4_restart); INSERT INTO t5_restart (SELECT 0, c2, c3, c4, c5 FROM t5_restart); INSERT INTO t6_restart (SELECT 0, c2, c3, c4, c5 FROM t6_restart); INSERT INTO t7_restart (SELECT 0, c2, c3, c4, c5 FROM t7_restart); -INSERT INTO t8_restart (SELECT 0, c2, c3, c4, c5 FROM t8_restart); -INSERT INTO t9_restart (SELECT 0, c2, c3, c4, c5 FROM t9_restart); SELECT count(*) FROM t1_restart; SELECT count(*) FROM t2_restart; @@ -231,8 +204,6 @@ SELECT count(*) FROM t4_restart; SELECT count(*) FROM t5_restart; SELECT count(*) FROM t6_restart; SELECT count(*) FROM t7_restart; -SELECT count(*) FROM t8_restart; -SELECT count(*) FROM t9_restart; --echo # --echo # Show these tables in information_schema. @@ -247,9 +218,6 @@ DROP TABLE t3_restart; # and an ISL file will be created not using InnoDB. # Table t5_restart will be expanded. # Tables t6_restart and t7_restart will be truncated. -DROP TABLE t8_restart; -DROP TABLE t9_restart; -DROP TABLESPACE s1_restart; --echo # --echo # Truncate the remote tablespaces. -- cgit v1.2.1