diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-11 11:02:27 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-11 11:15:11 +0200 |
commit | 5407117a59a87a1e0042581bc9c258cd2e743c85 (patch) | |
tree | ac30d7e0ba8501683cff593ae523035a3a8b3b4a /mysql-test/suite/innodb_i_s | |
parent | 9bc874a594edbc0e124131d0ff30b44f5fade52d (diff) | |
download | mariadb-git-5407117a59a87a1e0042581bc9c258cd2e743c85.tar.gz |
MDEV-22343 Remove SYS_TABLESPACES and SYS_DATAFILESbb-10.6-MDEV-23497
The InnoDB internal tables SYS_TABLESPACES and SYS_DATAFILES as well as the
INFORMATION_SCHEMA views INNODB_SYS_TABLESPACES and INNODB_SYS_DATAFILES
were introduced in MySQL 5.6 for no good reason in
mysql/mysql-server/commit/e9255a22ef16d612a8076bc0b34002bc5a784627
when the InnoDB support for the DATA DIRECTORY attribute was introduced.
The file system should be the authoritative source of information on files.
Storing information about file system paths in the file system (symlinks,
or even the .isl files that were unfortunately chosen as the solution) is
sufficient. If information is additionally stored in some hidden tables
inside the InnoDB system tablespace, everything unnecessarily becomes
more complicated, because more copies of data mean more opportunity
for the copies to be out of sync, and because modifying the data in
the system tablespace in the desired way might not be possible at all
without modifying the InnoDB source code. So, the copy in the system
tablespace basically is a redundant, non-authoritative source of
information.
We will stop creating or accessing the system tables SYS_TABLESPACES
and SYS_DATAFILES.
We will also remove the view
INFORMATION_SCHEMA.INNODB_SYS_DATAFILES along with SYS_DATAFILES.
The view
INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES will be repurposed
to directly reflect fil_system.space_list. The column
PAGE_SIZE, which would always contain the value of
the GLOBAL read-only variable innodb_page_size, is
removed. The column ZIP_PAGE_SIZE, which would actually
contain the physical page size of a page, is renamed to
PAGE_SIZE. Finally, a new column FILENAME is added, as a
replacement of SYS_DATAFILES.PATH.
This will also
address MDEV-21801 (files that were created before upgrading
to MySQL 5.6 or MariaDB 10.0 or later were never registered
in SYS_TABLESPACES or SYS_DATAFILES) and
MDEV-21801 (information about the system tablespace is not stored
in SYS_TABLESPACES or SYS_DATAFILES).
Diffstat (limited to 'mysql-test/suite/innodb_i_s')
4 files changed, 1 insertions, 11 deletions
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt deleted file mode 100644 index d6803d5ecdf..00000000000 --- a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb_sys_datafiles diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result deleted file mode 100644 index eb2dd8b71ad..00000000000 --- a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result +++ /dev/null @@ -1,6 +0,0 @@ -SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_DATAFILES; -Table Create Table -INNODB_SYS_DATAFILES CREATE TEMPORARY TABLE `INNODB_SYS_DATAFILES` ( - `SPACE` int(11) unsigned NOT NULL DEFAULT 0, - `PATH` varchar(4000) NOT NULL DEFAULT '' -) ENGINE=MEMORY DEFAULT CHARSET=utf8 diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test deleted file mode 100644 index dd843fec761..00000000000 --- a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.test +++ /dev/null @@ -1,3 +0,0 @@ ---source include/have_innodb.inc - -SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_DATAFILES; diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result index 40e337f49f3..cc8728bc9ad 100644 --- a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result +++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result @@ -6,7 +6,7 @@ INNODB_SYS_TABLESPACES CREATE TEMPORARY TABLE `INNODB_SYS_TABLESPACES` ( `FLAG` int(11) unsigned NOT NULL DEFAULT 0, `ROW_FORMAT` varchar(22) DEFAULT NULL, `PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0, - `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0, + `FILENAME` varchar(512) NOT NULL DEFAULT '', `FS_BLOCK_SIZE` int(11) unsigned NOT NULL DEFAULT 0, `FILE_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0, `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0 |