From f1c09e6d43ba04963312b142c7f290c45e5d3853 Mon Sep 17 00:00:00 2001 From: Satya Bodapati Date: Thu, 14 Mar 2019 00:08:55 +0530 Subject: [PATCH] innodb_system tablespace information missing from I_S innodb_tablespaces view Problem: -------- innodb system tablespace entry missing from SELECT * FROM INFORMATION_SCHEMA.INNODB_TABLESPACES; 1) innodb system tablespace entry missing from I_S.INNODB_TABLESPACES VIEW 2) The row format shows "Compact or Redundant" for innodb system tablespace. This is wrong. Dynamic is allowed too. So it should show "any". 3) FS_BLOCK_SIZE, FILE_SIZE, ALLOCATED_SIZE are empty for undo tablespaces. Undo tablespace is also single-file tablespace and above stats can be retrieved. Fix: ---- Make sure system tablespace entry exists in I_S.INNODB_TABLESPACES output Also fix 2) and 3). --- .../r/partition_innodb_tablespace.result | 14 +++++ .../suite/innodb/r/create_tablespace.result | 38 +++++++++++- .../innodb/r/create_tablespace_16k.result | 14 +++++ .../innodb/r/create_tablespace_32k.result | 4 ++ .../innodb/r/create_tablespace_4k.result | 14 +++++ .../innodb/r/create_tablespace_64k.result | 4 ++ .../innodb/r/create_tablespace_8k.result | 14 +++++ .../innodb/r/create_tablespace_debug.result | 2 + .../innodb/r/innodb-wl5980-discard.result | 18 ++++++ .../suite/innodb/r/innodb_tablespace.result | 26 ++++++++ .../innodb/r/tablespace_per_table.result | 26 ++++++++ .../innodb_fts/r/tablespace_location.result | 2 + .../r/tablespace_location_error.result | 2 + mysql-test/suite/innodb_zip/r/16k.result | 2 + mysql-test/suite/innodb_zip/r/4k.result | 2 + mysql-test/suite/innodb_zip/r/8k.result | 2 + mysql-test/suite/innodb_zip/r/restart.result | 18 ++++++ .../r/partition_reorganize_innodb.result | 4 ++ storage/innobase/handler/i_s.cc | 60 ++++++++++++------- 19 files changed, 244 insertions(+), 22 deletions(-) diff --git a/mysql-test/r/partition_innodb_tablespace.result b/mysql-test/r/partition_innodb_tablespace.result index 27d711a4371..7998fa6cc3d 100644 --- a/mysql-test/r/partition_innodb_tablespace.result +++ b/mysql-test/r/partition_innodb_tablespace.result @@ -41,12 +41,14 @@ test/t1#p#p0 test/t1#p#p0 97 5 Dynamic 0 Single test/t1#p#p1 test/t1#p#p1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd test/t1#p#p1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t1#p#p1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 TABLESPACE InnoDB NORMAL test/t1#p#p0 MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd @@ -83,12 +85,14 @@ test/t1#p#p0 test/t1#p#p0 97 5 Dynamic 0 Single test/t1#p#p1 test/t1#p#p1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd test/t1#p#p1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t1#p#p1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 TABLESPACE InnoDB NORMAL test/t1#p#p0 MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd @@ -114,12 +118,14 @@ test/t11#p#p0 test/t11#p#p0 97 5 Dynamic 0 Single test/t11#p#p1 test/t11#p#p1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t11#p#p0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t11#p#p0.ibd test/t11#p#p1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t11#p#p1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t11#p#p0 TABLESPACE InnoDB NORMAL test/t11#p#p0 MYSQL_TMP_DIR/alternate_dir/data/test/t11#p#p0.ibd @@ -154,12 +160,14 @@ test/t1#p#p0 test/t1#p#p0 97 5 Dynamic 0 Single test/t1#p#p1 test/t1#p#p1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd test/t1#p#p1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t1#p#p1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 TABLESPACE InnoDB NORMAL test/t1#p#p0 MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0.ibd @@ -228,6 +236,7 @@ test/t1#p#p2#sp#s4 test/t1#p#p2#sp#s4 97 5 Dynamic 0 Single test/t1#p#p2#sp#s5 test/t1#p#p2#sp#s5 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0#sp#s0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0#sp#s0.ibd @@ -238,6 +247,7 @@ test/t1#p#p2#sp#s4 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/tes test/t1#p#p2#sp#s5 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t1#p#p2#sp#s5.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0#sp#s0 TABLESPACE InnoDB NORMAL test/t1#p#p0#sp#s0 MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0#sp#s0.ibd @@ -312,6 +322,7 @@ test/t1#p#p2#sp#s4 test/t1#p#p2#sp#s4 97 5 Dynamic 0 Single test/t1#p#p2#sp#s5 test/t1#p#p2#sp#s5 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0#sp#s0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0#sp#s0.ibd @@ -322,6 +333,7 @@ test/t1#p#p2#sp#s4 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data/tes test/t1#p#p2#sp#s5 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data2/test/t1#p#p2#sp#s5.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0#sp#s0 TABLESPACE InnoDB NORMAL test/t1#p#p0#sp#s0 MYSQL_TMP_DIR/alternate_dir/data/test/t1#p#p0#sp#s0.ibd @@ -461,12 +473,14 @@ test/t_file_per_table_off innodb_system 161 5 Dynamic 0 System test/t_file_per_table_on test/t_file_per_table_on 33 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alternate_dir/data_part/test/t1#p#p0.ibd test/t_file_per_table_on Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_file_per_table_on.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1#p#p0 TABLESPACE InnoDB NORMAL test/t1#p#p0 MYSQL_TMP_DIR/alternate_dir/data_part/test/t1#p#p0.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace.result b/mysql-test/suite/innodb/r/create_tablespace.result index e80545f9b72..02533df10ca 100644 --- a/mysql-test/suite/innodb/r/create_tablespace.result +++ b/mysql-test/suite/innodb/r/create_tablespace.result @@ -150,20 +150,22 @@ t_utf8_3 CREATE TABLE `t_utf8_3` ( === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path #sql_1 General DEFAULT 0 Any #sql_1.ibd +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_ !@#$%^&*()_+-={}[]|\?<>,. General DEFAULT 0 Any s_utf8.ibd -s_Cöŀumň General DEFAULT 0 Any s_utf8_a.ibd s_cöĿǖmň General DEFAULT 0 Any s_utf8_b.ibd +s_Cöŀumň General DEFAULT 0 Any s_utf8_a.ibd s_வணக்கம் General DEFAULT 0 Any ஆவணம்.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path #sql_1 TABLESPACE InnoDB NORMAL #sql_1 MYSQLD_DATADIR/#sql_1.ibd +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_ !@#$%^&*()_+-={}[]|\?<>,. TABLESPACE InnoDB NORMAL s_ !@#$%^&*()_+-={}[]|\?<>,. MYSQLD_DATADIR/s_utf8.ibd -s_Cöŀumň TABLESPACE InnoDB NORMAL s_Cöŀumň MYSQLD_DATADIR/s_utf8_a.ibd s_cöĿǖmň TABLESPACE InnoDB NORMAL s_cöĿǖmň MYSQLD_DATADIR/s_utf8_b.ibd +s_Cöŀumň TABLESPACE InnoDB NORMAL s_Cöŀumň MYSQLD_DATADIR/s_utf8_a.ibd s_வணக்கம் TABLESPACE InnoDB NORMAL s_வணக்கம் MYSQLD_DATADIR/ஆவணம்.ibd === information_schema.innodb_tables and innodb_tablespaces === Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type @@ -317,6 +319,7 @@ CREATE TABLESPACE s6_def ADD DATAFILE 'MYSQL_TMP_DIR/tablespace.ibd'; ERROR HY000: The ADD DATAFILE filepath already exists. === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s1_#_hash General DEFAULT 0 Any s1_#_hash.ibd @@ -326,6 +329,7 @@ s4_def General DEFAULT 0 Any MYSQL_TMP_DIR/tablespace.ibd/s4.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s1_#_hash TABLESPACE InnoDB NORMAL s1_#_hash MYSQLD_DATADIR/s1_#_hash.ibd @@ -371,12 +375,14 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t_single test/t_single 33 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd test/t_single Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_single.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -420,11 +426,13 @@ Error 3119 Incorrect tablespace name `TEST/T_SINGLE` DROP TABLE t_single; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -451,11 +459,13 @@ DROP TABLESPACE s_def; ERROR HY000: Tablespace `s_def` is not empty. === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -495,11 +505,13 @@ test/test@002ft_def_in_def s_def 161 5 Dynamic 0 General test/t_def_in_def s_def 161 5 Dynamic 0 General === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -552,12 +564,14 @@ Error 3119 InnoDB: A general tablespace name cannot contain '/'. Error 3119 Incorrect tablespace name `test/s_single` === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd test/s_single Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/s_single.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -628,11 +642,13 @@ Level Code Message Error 1525 Incorrect path value: 'test' === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -658,11 +674,13 @@ Error 1478 InnoDB: Tablespace `innodb_system` cannot contain a COMPRESSED table Error 1031 Table storage engine for 't_zip_in_system' doesn't have this option === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -694,6 +712,7 @@ CREATE TABLE t_dyn_as_file_per_table (a int, b text) TABLESPACE=innodb_file_per_ CREATE TABLE t_def_as_remote (a int, b text) TABLESPACE=innodb_file_per_table DATA DIRECTORY='MYSQL_TMP_DIR'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd @@ -703,6 +722,7 @@ test/t_dyn_as_file_per_table Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_dyn_ test/t_red_as_file_per_table Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/test/t_red_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -759,12 +779,14 @@ ALTER TABLE `t_dyn_as_file_per_table` TABLESPACE=`s_multiple`, RENAME TO `t_dyn_ ALTER TABLE `t_def_as_remote` TABLESPACE=`s_multiple`, RENAME TO `t_def_was_remote`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd s_multiple General DEFAULT 0 Any multiple.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -794,6 +816,7 @@ Warnings: Warning 1618 option ignored === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd @@ -804,6 +827,7 @@ test/t_dyn_to_file_per_table Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_dyn_ test/t_red_to_file_per_table Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/test/t_red_to_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -927,6 +951,7 @@ CREATE TABLESPACE s_ignore4 ADD DATAFILE 's_ignore4.ibd' WAIT; CREATE TABLESPACE s_ignore5 ADD DATAFILE 's_ignore5.ibd' COMMENT = 'This comment is ignored'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd @@ -937,6 +962,7 @@ s_ignore4 General DEFAULT 0 Any s_ignore4.ibd s_ignore5 General DEFAULT 0 Any s_ignore5.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -1147,6 +1173,7 @@ CREATE TABLESPACE s_alt1 ADD DATAFILE 's_alt1.ibd'; CREATE TABLESPACE s_alt2 ADD DATAFILE 's_alt2.ibd'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_alt1 General DEFAULT 0 Any s_alt1.ibd @@ -1154,6 +1181,7 @@ s_alt2 General DEFAULT 0 Any s_alt2.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_alt1 TABLESPACE InnoDB NORMAL s_alt1 MYSQLD_DATADIR/s_alt1.ibd @@ -1207,6 +1235,7 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t_nomad s_def 161 4 Dynamic 0 General === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_alt1 General DEFAULT 0 Any s_alt1.ibd @@ -1214,6 +1243,7 @@ s_alt2 General DEFAULT 0 Any s_alt2.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_alt1 TABLESPACE InnoDB NORMAL s_alt1 MYSQLD_DATADIR/s_alt1.ibd @@ -1687,6 +1717,7 @@ test1/t_single test1/t_single 33 5 Dynamic 0 Single test1/t_system innodb_system 33 5 Dynamic 0 System === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd @@ -1695,6 +1726,7 @@ test/t_single Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_single.ibd test1/t_single Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test1/t_single.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd @@ -1711,6 +1743,7 @@ test/t_single test/t_single 33 5 Dynamic 0 Single test/t_system innodb_system 33 5 Dynamic 0 System === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd @@ -1718,6 +1751,7 @@ s_empty1 General DEFAULT 0 Any s_empty1.ibd test/t_single Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t_single.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_16k.result b/mysql-test/suite/innodb/r/create_tablespace_16k.result index 50697c13528..10ed1a8b3e1 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_16k.result +++ b/mysql-test/suite/innodb/r/create_tablespace_16k.result @@ -35,6 +35,7 @@ Error 1528 Failed to create TABLESPACE s_64k Error 1031 Table storage engine for 's_64k' doesn't have this option === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -44,6 +45,7 @@ s_4k General DEFAULT 4096 Compressed s_4k.ibd s_8k General DEFAULT 8192 Compressed s_8k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -381,6 +383,7 @@ CREATE TABLESPACE s_missing ADD DATAFILE 'delete_me.ibd'; CREATE TABLE t_missing (a int) TABLESPACE=s_missing; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -391,6 +394,7 @@ s_8k General DEFAULT 8192 Compressed s_8k.ibd s_missing General DEFAULT 0 Any delete_me.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -449,6 +453,7 @@ s_8k.ibd # === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -459,6 +464,7 @@ s_8k General DEFAULT 8192 Compressed s_8k.ibd s_missing General DEFAULT 0 Any delete_me.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -581,6 +587,7 @@ CREATE TABLE t_zip8k_as_remote (a int, b text) KEY_BLOCK_SIZE=8 TABLESPACE=innod CREATE TABLE t_zip16k_as_remote (a int, b text) KEY_BLOCK_SIZE=16 TABLESPACE=innodb_file_per_table DATA DIRECTORY='MYSQL_TMP_DIR'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -600,6 +607,7 @@ test/t_zip8k_as_file_per_table Single DEFAULT 8192 Compressed MYSQLD_DATADIR/tes test/t_zip8k_as_remote Single DEFAULT 8192 Compressed MYSQL_TMP_DIR/test/t_zip8k_as_remote.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -916,6 +924,7 @@ ALTER TABLE `t_zip4k_as_remote` TABLESPACE=`s_4k`, RENAME TO `t_zip4k_remote_in_ ALTER TABLE `t_zip8k_as_remote` TABLESPACE=`s_8k`, RENAME TO `t_zip8k_remote_in_s_8k`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -926,6 +935,7 @@ s_8k General DEFAULT 8192 Compressed s_8k.ibd test/t_zip16k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/test/t_zip16k_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -1090,6 +1100,7 @@ ALTER TABLE `t_zip4k_in_s_4k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_z ALTER TABLE `t_zip8k_in_s_8k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_zip8k_to_file_per_table`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -1104,6 +1115,7 @@ test/t_zip4k_to_file_per_table Single DEFAULT 4096 Compressed MYSQLD_DATADIR/tes test/t_zip8k_to_file_per_table Single DEFAULT 8192 Compressed MYSQLD_DATADIR/test/t_zip8k_to_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd @@ -1167,6 +1179,7 @@ Warnings: Warning 1618 option ignored === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k General DEFAULT 0 Any s_16k.ibd @@ -1180,6 +1193,7 @@ test/t_zip4k_to_file_per_table Single DEFAULT 4096 Compressed MYSQLD_DATADIR/tes test/t_zip8k_to_file_per_table Single DEFAULT 8192 Compressed MYSQLD_DATADIR/test/t_zip8k_to_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_16k TABLESPACE InnoDB NORMAL s_16k MYSQLD_DATADIR/s_16k.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_32k.result b/mysql-test/suite/innodb/r/create_tablespace_32k.result index ebfc460541b..78f192c1899 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_32k.result +++ b/mysql-test/suite/innodb/r/create_tablespace_32k.result @@ -59,11 +59,13 @@ Error 1528 Failed to create TABLESPACE s_64k Error 1031 Table storage engine for 's_64k' doesn't have this option === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_32k General DEFAULT 0 Any s_32k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_32k TABLESPACE InnoDB NORMAL s_32k MYSQLD_DATADIR/s_32k.ibd @@ -132,11 +134,13 @@ INSERT INTO t_dyn_in_32k VALUES (4,'d'); # restart === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_32k General DEFAULT 0 Any s_32k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_32k TABLESPACE InnoDB NORMAL s_32k MYSQLD_DATADIR/s_32k.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_4k.result b/mysql-test/suite/innodb/r/create_tablespace_4k.result index 5ca6264f4ba..48816ca063d 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_4k.result +++ b/mysql-test/suite/innodb/r/create_tablespace_4k.result @@ -47,6 +47,7 @@ Error 1528 Failed to create TABLESPACE s_64k Error 1031 Table storage engine for 's_64k' doesn't have this option === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -54,6 +55,7 @@ s_2k General DEFAULT 2048 Compressed s_2k.ibd s_4k General DEFAULT 0 Any s_4k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -261,6 +263,7 @@ CREATE TABLE t_com_in_4k_from_1k TABLESPACE s_4k ROW_FORMAT=compact AS (SELECT * CREATE TABLE t_dyn_in_4k_from_1k TABLESPACE s_4k ROW_FORMAT=dynamic AS (SELECT * FROM t_zip1k_in_1k); === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -268,6 +271,7 @@ s_2k General DEFAULT 2048 Compressed s_2k.ibd s_4k General DEFAULT 0 Any s_4k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -308,6 +312,7 @@ s_4k.ibd # restart === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -315,6 +320,7 @@ s_2k General DEFAULT 2048 Compressed s_2k.ibd s_4k General DEFAULT 0 Any s_4k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -400,6 +406,7 @@ CREATE TABLE t_zip2k_as_remote (a int, b text) KEY_BLOCK_SIZE=2 TABLESPACE=innod CREATE TABLE t_zip4k_as_remote (a int, b text) KEY_BLOCK_SIZE=4 TABLESPACE=innodb_file_per_table DATA DIRECTORY='MYSQL_TMP_DIR'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -413,6 +420,7 @@ test/t_zip4k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/ test/t_zip4k_as_remote Single DEFAULT DEFAULT Compressed MYSQL_TMP_DIR/test/t_zip4k_as_remote.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -531,6 +539,7 @@ ALTER TABLE `t_zip1k_as_remote` TABLESPACE=`s_1k`, RENAME TO `t_zip1k_remote_in_ ALTER TABLE `t_zip2k_as_remote` TABLESPACE=`s_2k`, RENAME TO `t_zip2k_remote_in_s_2k`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -539,6 +548,7 @@ s_4k General DEFAULT 0 Any s_4k.ibd test/t_zip4k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/test/t_zip4k_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -609,6 +619,7 @@ ALTER TABLE `t_zip1k_in_s_1k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_z ALTER TABLE `t_zip2k_in_s_2k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_zip2k_to_file_per_table`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -619,6 +630,7 @@ test/t_zip2k_to_file_per_table Single DEFAULT 2048 Compressed MYSQLD_DATADIR/tes test/t_zip4k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/test/t_zip4k_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -660,6 +672,7 @@ Warnings: Warning 1618 option ignored === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -669,6 +682,7 @@ test/t_zip1k_to_file_per_table Single DEFAULT 1024 Compressed MYSQLD_DATADIR/tes test/t_zip2k_to_file_per_table Single DEFAULT 2048 Compressed MYSQLD_DATADIR/test/t_zip2k_to_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_64k.result b/mysql-test/suite/innodb/r/create_tablespace_64k.result index 2df2ae717b1..eca877ff266 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_64k.result +++ b/mysql-test/suite/innodb/r/create_tablespace_64k.result @@ -59,11 +59,13 @@ Error 1031 Table storage engine for 's_32k' doesn't have this option CREATE TABLESPACE s_64k ADD DATAFILE 's_64k.ibd' FILE_BLOCK_SIZE=64k; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_64k General DEFAULT 0 Any s_64k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_64k TABLESPACE InnoDB NORMAL s_64k MYSQLD_DATADIR/s_64k.ibd @@ -138,11 +140,13 @@ INSERT INTO t_dyn_in_64k VALUES (4,'d'); # restart === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_64k General DEFAULT 0 Any s_64k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_64k TABLESPACE InnoDB NORMAL s_64k MYSQLD_DATADIR/s_64k.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_8k.result b/mysql-test/suite/innodb/r/create_tablespace_8k.result index 20c655eceea..1d2b7f966ca 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_8k.result +++ b/mysql-test/suite/innodb/r/create_tablespace_8k.result @@ -41,6 +41,7 @@ Error 1528 Failed to create TABLESPACE s_64k Error 1031 Table storage engine for 's_64k' doesn't have this option === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -49,6 +50,7 @@ s_4k General DEFAULT 4096 Compressed s_4k.ibd s_8k General DEFAULT 0 Any s_8k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -314,6 +316,7 @@ CREATE TABLE t_com_in_8k_from_1k TABLESPACE s_8k ROW_FORMAT=compact AS (SELECT * CREATE TABLE t_dyn_in_8k_from_1k TABLESPACE s_8k ROW_FORMAT=dynamic AS (SELECT * FROM t_zip1k_in_1k); === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -322,6 +325,7 @@ s_4k General DEFAULT 4096 Compressed s_4k.ibd s_8k General DEFAULT 0 Any s_8k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -368,6 +372,7 @@ s_8k.ibd # restart === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -376,6 +381,7 @@ s_4k General DEFAULT 4096 Compressed s_4k.ibd s_8k General DEFAULT 0 Any s_8k.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -478,6 +484,7 @@ CREATE TABLE t_zip4k_as_remote (a int, b text) KEY_BLOCK_SIZE=4 TABLESPACE=innod CREATE TABLE t_zip8k_as_remote (a int, b text) KEY_BLOCK_SIZE=8 TABLESPACE=innodb_file_per_table DATA DIRECTORY='MYSQL_TMP_DIR'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -494,6 +501,7 @@ test/t_zip8k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/ test/t_zip8k_as_remote Single DEFAULT DEFAULT Compressed MYSQL_TMP_DIR/test/t_zip8k_as_remote.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -693,6 +701,7 @@ ALTER TABLE `t_zip2k_as_remote` TABLESPACE=`s_2k`, RENAME TO `t_zip2k_remote_in_ ALTER TABLE `t_zip4k_as_remote` TABLESPACE=`s_4k`, RENAME TO `t_zip4k_remote_in_s_4k`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -702,6 +711,7 @@ s_8k General DEFAULT 0 Any s_8k.ibd test/t_zip8k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/test/t_zip8k_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -813,6 +823,7 @@ ALTER TABLE `t_zip2k_in_s_2k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_z ALTER TABLE `t_zip4k_in_s_4k` TABLESPACE=`innodb_file_per_table`, RENAME TO `t_zip4k_to_file_per_table`; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -825,6 +836,7 @@ test/t_zip4k_to_file_per_table Single DEFAULT 4096 Compressed MYSQLD_DATADIR/tes test/t_zip8k_as_file_per_table Single DEFAULT DEFAULT Compressed MYSQLD_DATADIR/test/t_zip8k_as_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd @@ -877,6 +889,7 @@ Warnings: Warning 1618 option ignored === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k General DEFAULT 1024 Compressed s_1k.ibd @@ -888,6 +901,7 @@ test/t_zip2k_to_file_per_table Single DEFAULT 2048 Compressed MYSQLD_DATADIR/tes test/t_zip4k_to_file_per_table Single DEFAULT 4096 Compressed MYSQLD_DATADIR/test/t_zip4k_to_file_per_table.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_1k TABLESPACE InnoDB NORMAL s_1k MYSQLD_DATADIR/s_1k.ibd diff --git a/mysql-test/suite/innodb/r/create_tablespace_debug.result b/mysql-test/suite/innodb/r/create_tablespace_debug.result index c146d694a1d..26203512efe 100644 --- a/mysql-test/suite/innodb/r/create_tablespace_debug.result +++ b/mysql-test/suite/innodb/r/create_tablespace_debug.result @@ -8,10 +8,12 @@ ERROR HY000: Failed to create TABLESPACE s_def SET SESSION DEBUG='-d,innodb_fail_to_update_tablespace_dict'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd # MYSQLD_DATADIR/ diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-discard.result b/mysql-test/suite/innodb/r/innodb-wl5980-discard.result index fab24f9944b..31cb0cb40d0 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5980-discard.result +++ b/mysql-test/suite/innodb/r/innodb-wl5980-discard.result @@ -210,11 +210,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t5980 test/t5980 97 6 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980 TABLESPACE InnoDB NORMAL test/t5980 MYSQL_TMP_DIR/alt_dir/test/t5980.ibd @@ -228,10 +230,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd ### files in MYSQLD_DATADIR/test @@ -433,11 +437,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t5980 test/t5980 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980 TABLESPACE InnoDB NORMAL test/t5980 MYSQL_TMP_DIR/alt_dir/test/t5980.ibd @@ -502,6 +508,7 @@ test/t5980c test/t5980c 33 5 Dynamic 0 Single test/t5980d test/t5980d 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980a Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980a.ibd @@ -510,6 +517,7 @@ test/t5980c Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980c.ibd test/t5980d Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980d.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980a TABLESPACE InnoDB NORMAL test/t5980a MYSQLD_DATADIR/test/t5980a.ibd @@ -566,6 +574,7 @@ test/t5980c test/t5980c 33 5 Dynamic 0 Single test/t5980d test/t5980d 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980a Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980a.ibd @@ -574,6 +583,7 @@ test/t5980c Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980c.ibd test/t5980d Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980d.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd Warnings: @@ -645,6 +655,7 @@ test/t5980c test/t5980c 33 5 Dynamic 0 Single test/t5980d test/t5980d 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980aa Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980a.ibd @@ -653,6 +664,7 @@ test/t5980c Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980c.ibd test/t5980d Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980d.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd Warnings: @@ -722,6 +734,7 @@ test/t5980c test/t5980c 33 5 Dynamic 0 Single test/t5980d test/t5980d 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980aa Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980a.ibd @@ -730,6 +743,7 @@ test/t5980c Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980c.ibd test/t5980d Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980d.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd Warnings: @@ -782,6 +796,7 @@ test/t5980c test/t5980c 33 5 Dynamic 0 Single test/t5980d test/t5980d 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t5980a Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980a.ibd @@ -790,6 +805,7 @@ test/t5980c Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t5980c.ibd test/t5980d Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t5980d.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd Warnings: @@ -895,10 +911,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd ### files in MYSQLD_DATADIR/test diff --git a/mysql-test/suite/innodb/r/innodb_tablespace.result b/mysql-test/suite/innodb/r/innodb_tablespace.result index 2a031a17463..081e5c7a4d9 100644 --- a/mysql-test/suite/innodb/r/innodb_tablespace.result +++ b/mysql-test/suite/innodb/r/innodb_tablespace.result @@ -100,11 +100,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -118,10 +120,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd # @@ -146,11 +150,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -172,11 +178,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -202,11 +210,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t2 test/t2 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t2.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 TABLESPACE InnoDB NORMAL test/t2 MYSQL_TMP_DIR/alt_dir/test/t2.ibd @@ -229,12 +239,14 @@ test/t2 test/t2 97 5 Dynamic 0 Single test/t3 test/t3 33 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t2.ibd test/t3 Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t3.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 TABLESPACE InnoDB NORMAL test/t2 MYSQL_TMP_DIR/alt_dir/test/t2.ibd @@ -251,10 +263,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd ---- MYSQLD_DATADIR/test @@ -341,11 +355,13 @@ CREATE PROCEDURE static_proc() BEGIN CREATE TABLE t1 (a int KEY, b text) DATA DI CALL static_proc; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -372,11 +388,13 @@ CREATE PROCEDURE dynamic_proc() BEGIN PREPARE stmt1 FROM "CREATE TABLE t1 (a int CALL dynamic_proc; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -438,6 +456,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -445,6 +464,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -485,12 +505,14 @@ test/emp#p#east test/emp#p#east 97 7 Dynamic 0 Single test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p#north.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -532,6 +554,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -539,6 +562,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -582,6 +606,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -589,6 +614,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd diff --git a/mysql-test/suite/innodb/r/tablespace_per_table.result b/mysql-test/suite/innodb/r/tablespace_per_table.result index d0c3eed86f3..56c04af6d36 100644 --- a/mysql-test/suite/innodb/r/tablespace_per_table.result +++ b/mysql-test/suite/innodb/r/tablespace_per_table.result @@ -107,11 +107,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -125,10 +127,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd # @@ -154,11 +158,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -180,11 +186,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t1 test/t1 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -207,11 +215,13 @@ mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single test/t2 test/t2 97 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t2.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 TABLESPACE InnoDB NORMAL test/t2 MYSQL_TMP_DIR/alt_dir/test/t2.ibd @@ -234,12 +244,14 @@ test/t2 test/t2 97 5 Dynamic 0 Single test/t3 test/t3 33 5 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t2.ibd test/t3 Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t3.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t2 TABLESPACE InnoDB NORMAL test/t2 MYSQL_TMP_DIR/alt_dir/test/t2.ibd @@ -256,10 +268,12 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd ---- MYSQLD_DATADIR/test @@ -341,11 +355,13 @@ CREATE PROCEDURE static_proc() BEGIN CREATE TABLE t1 (a int KEY, b text) DATA DI CALL static_proc; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -388,11 +404,13 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir/' === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/test/t1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQL_TMP_DIR/alt_dir/test/t1.ibd @@ -448,6 +466,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -455,6 +474,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -494,12 +514,14 @@ test/emp#p#east test/emp#p#east 97 7 Dynamic 0 Single test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p#north.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -531,6 +553,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -538,6 +561,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -581,6 +605,7 @@ test/emp#p#north test/emp#p#north 97 7 Dynamic 0 Single test/emp#p#west test/emp#p#west 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd @@ -588,6 +613,7 @@ test/emp#p#north Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_north/test/emp#p test/emp#p#west Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east TABLESPACE InnoDB NORMAL test/emp#p#east MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east.ibd diff --git a/mysql-test/suite/innodb_fts/r/tablespace_location.result b/mysql-test/suite/innodb_fts/r/tablespace_location.result index 74845fcc583..1e5d67d625e 100644 --- a/mysql-test/suite/innodb_fts/r/tablespace_location.result +++ b/mysql-test/suite/innodb_fts/r/tablespace_location.result @@ -17,12 +17,14 @@ CREATE TABLESPACE s_def ADD DATAFILE 's_def.ibd'; CREATE TABLESPACE s_zip ADD DATAFILE 's_zip.ibd' FILE_BLOCK_SIZE=2k; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd s_zip General DEFAULT 2048 Compressed s_zip.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd diff --git a/mysql-test/suite/innodb_fts/r/tablespace_location_error.result b/mysql-test/suite/innodb_fts/r/tablespace_location_error.result index 40582c9bbe6..f73a689d6f3 100644 --- a/mysql-test/suite/innodb_fts/r/tablespace_location_error.result +++ b/mysql-test/suite/innodb_fts/r/tablespace_location_error.result @@ -226,11 +226,13 @@ DROP TABLE t1; CREATE TABLESPACE s_def ADD DATAFILE 's_def.ibd'; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def General DEFAULT 0 Any s_def.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd s_def TABLESPACE InnoDB NORMAL s_def MYSQLD_DATADIR/s_def.ibd diff --git a/mysql-test/suite/innodb_zip/r/16k.result b/mysql-test/suite/innodb_zip/r/16k.result index 6ea27882092..c771804d41f 100644 --- a/mysql-test/suite/innodb_zip/r/16k.result +++ b/mysql-test/suite/innodb_zip/r/16k.result @@ -40,6 +40,7 @@ test/t3 5 41 PRIMARY 4 3 4 50 test/t4 5 33 PRIMARY 4 3 4 50 === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/test/t1.ibd @@ -48,6 +49,7 @@ test/t3 Single DEFAULT 8192 Compressed MYSQLD_DATADIR/test/t3.ibd test/t4 Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t4.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQLD_DATADIR/test/t1.ibd diff --git a/mysql-test/suite/innodb_zip/r/4k.result b/mysql-test/suite/innodb_zip/r/4k.result index aaa14940c49..2a000aa3fc1 100644 --- a/mysql-test/suite/innodb_zip/r/4k.result +++ b/mysql-test/suite/innodb_zip/r/4k.result @@ -77,6 +77,7 @@ test/t3 5 37 PRIMARY 4 3 4 50 test/t4 5 33 PRIMARY 4 3 4 50 === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/test/t1.ibd @@ -85,6 +86,7 @@ test/t3 Single DEFAULT 2048 Compressed MYSQLD_DATADIR/test/t3.ibd test/t4 Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t4.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQLD_DATADIR/test/t1.ibd diff --git a/mysql-test/suite/innodb_zip/r/8k.result b/mysql-test/suite/innodb_zip/r/8k.result index 11c390aba68..bc5d25a4f5f 100644 --- a/mysql-test/suite/innodb_zip/r/8k.result +++ b/mysql-test/suite/innodb_zip/r/8k.result @@ -40,6 +40,7 @@ test/t3 5 39 PRIMARY 4 3 4 50 test/t4 5 33 PRIMARY 4 3 4 50 === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/test/t1.ibd @@ -48,6 +49,7 @@ test/t3 Single DEFAULT 4096 Compressed MYSQLD_DATADIR/test/t3.ibd test/t4 Single DEFAULT 0 Dynamic MYSQLD_DATADIR/test/t4.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/t1 TABLESPACE InnoDB NORMAL test/t1 MYSQLD_DATADIR/test/t1.ibd diff --git a/mysql-test/suite/innodb_zip/r/restart.result b/mysql-test/suite/innodb_zip/r/restart.result index 2aa66f3e951..f684633ce1c 100644 --- a/mysql-test/suite/innodb_zip/r/restart.result +++ b/mysql-test/suite/innodb_zip/r/restart.result @@ -260,6 +260,7 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t1_restart Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/move_test/t1_restart.ibd move_test/t2_restart Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/move_test/t2_restart.ibd move_test/t3_restart Single DEFAULT 2048 Compressed MYSQLD_DATADIR/move_test/t3_restart.ibd @@ -277,6 +278,7 @@ mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressi s1_restart General DEFAULT 0 Any s1_restart.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t1_restart TABLESPACE InnoDB NORMAL move_test/t1_restart MYSQLD_DATADIR/move_test/t1_restart.ibd move_test/t2_restart TABLESPACE InnoDB NORMAL move_test/t2_restart MYSQLD_DATADIR/move_test/t2_restart.ibd move_test/t3_restart TABLESPACE InnoDB NORMAL move_test/t3_restart MYSQLD_DATADIR/move_test/t3_restart.ibd @@ -478,6 +480,7 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t1_restart Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/move_test/t1_restart.ibd move_test/t2_restart Single DEFAULT 0 Compact or Redundant MYSQLD_DATADIR/move_test/t2_restart.ibd move_test/t3_restart Single DEFAULT 2048 Compressed MYSQLD_DATADIR/move_test/t3_restart.ibd @@ -495,6 +498,7 @@ mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressi s1_restart General DEFAULT 0 Any s1_restart.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t1_restart TABLESPACE InnoDB NORMAL move_test/t1_restart MYSQLD_DATADIR/move_test/t1_restart.ibd move_test/t2_restart TABLESPACE InnoDB NORMAL move_test/t2_restart MYSQLD_DATADIR/move_test/t2_restart.ibd move_test/t3_restart TABLESPACE InnoDB NORMAL move_test/t3_restart MYSQLD_DATADIR/move_test/t3_restart.ibd @@ -524,6 +528,7 @@ ALTER TABLE t6_restart TRUNCATE PARTITION p2; ALTER TABLE t7_restart TRUNCATE PARTITION p1; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t5_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t5_restart.ibd move_test/t6_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t6_restart#p#p0.ibd @@ -537,6 +542,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t5_restart TABLESPACE InnoDB NORMAL move_test/t5_restart MYSQL_TMP_DIR/alt_dir/move_test/t5_restart.ibd move_test/t6_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t6_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t6_restart#p#p0.ibd @@ -627,6 +633,7 @@ Variable_name Value innodb_file_per_table ON === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t5_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t5_restart.ibd move_test/t6_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t6_restart#p#p0.ibd @@ -640,6 +647,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t5_restart TABLESPACE InnoDB NORMAL move_test/t5_restart MYSQL_TMP_DIR/alt_dir/move_test/t5_restart.ibd move_test/t6_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t6_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t6_restart#p#p0.ibd @@ -724,6 +732,7 @@ RENAME TABLE t6_restart TO t66_restart; RENAME TABLE t7_restart TO t77_restart; === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -737,6 +746,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart TABLESPACE InnoDB NORMAL move_test/t55_restart MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t66_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -822,6 +832,7 @@ Variable_name Value innodb_file_per_table ON === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -835,6 +846,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart TABLESPACE InnoDB NORMAL move_test/t55_restart MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t66_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -920,6 +932,7 @@ t77_restart#p#p1#sp#s3.ibd # restart:--innodb-directories=MYSQL_TMP_DIR/alt_dir === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -933,6 +946,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart TABLESPACE InnoDB NORMAL move_test/t55_restart MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t66_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -1021,6 +1035,7 @@ SUBPARTITION BY HASH (`c1`) # restart:--innodb-directories=MYSQL_TMP_DIR/alt_dir === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -1034,6 +1049,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart TABLESPACE InnoDB NORMAL move_test/t55_restart MYSQL_TMP_DIR/alt_dir/move_test/t55_restart.ibd move_test/t66_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t66_restart#p#p0 MYSQL_TMP_DIR/alt_dir/move_test/t66_restart#p#p0.ibd @@ -1216,6 +1232,7 @@ mtr/global_suppressions mtr/global_suppressions 33 4 Dynamic 0 Single mtr/test_suppressions mtr/test_suppressions 33 4 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 move_test/t4_restart Single DEFAULT 0 Dynamic MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_moved/move_test/t55_restart.ibd move_test/t66_restart#p#p0 Single DEFAULT 2048 Compressed MYSQL_TMP_DIR/alt_dir_moved/move_test/t66_restart#p#p0.ibd @@ -1229,6 +1246,7 @@ mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppr mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 move_test/t4_restart TABLESPACE InnoDB NORMAL move_test/t4_restart MYSQLD_DATADIR/move_test/t4_restart.ibd move_test/t55_restart TABLESPACE InnoDB NORMAL move_test/t55_restart MYSQL_TMP_DIR/alt_dir_moved/move_test/t55_restart.ibd move_test/t66_restart#p#p0 TABLESPACE InnoDB NORMAL move_test/t66_restart#p#p0 MYSQL_TMP_DIR/alt_dir_moved/move_test/t66_restart#p#p0.ibd diff --git a/mysql-test/suite/parts/r/partition_reorganize_innodb.result b/mysql-test/suite/parts/r/partition_reorganize_innodb.result index cce45ccc905..cddde7d34f2 100644 --- a/mysql-test/suite/parts/r/partition_reorganize_innodb.result +++ b/mysql-test/suite/parts/r/partition_reorganize_innodb.result @@ -55,6 +55,7 @@ test/emp#p#southwest#sp#sw2 test/emp#p#southwest#sp#sw2 97 7 Dynamic 0 Single test/emp#p#southwest#sp#sw3 test/emp#p#southwest#sp#sw3 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#northeast#sp#ne0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_northeast/test/emp#p#northeast#sp#ne0.ibd @@ -63,6 +64,7 @@ test/emp#p#southwest#sp#sw2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_south test/emp#p#southwest#sp#sw3 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_southwest/test/emp#p#southwest#sp#sw3.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#northeast#sp#ne0 TABLESPACE InnoDB NORMAL test/emp#p#northeast#sp#ne0 MYSQL_TMP_DIR/alt_dir_northeast/test/emp#p#northeast#sp#ne0.ibd @@ -139,6 +141,7 @@ test/emp#p#west#sp#w0 test/emp#p#west#sp#w0 97 7 Dynamic 0 Single test/emp#p#west#sp#w1 test/emp#p#west#sp#w1 97 7 Dynamic 0 Single === information_schema.innodb_tablespaces and innodb_datafiles === Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path +innodb_system System DEFAULT 0 Any ibdata1 mtr/global_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions Single DEFAULT 0 Dynamic MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east#sp#e0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east#sp#e0.ibd @@ -151,6 +154,7 @@ test/emp#p#west#sp#w0 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/e test/emp#p#west#sp#w1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west#sp#w1.ibd === information_schema.files === Space_Name File_Type Engine Status Tablespace_Name Path +innodb_system TABLESPACE InnoDB NORMAL innodb_system MYSQLD_DATADIR/ibdata1 mtr/global_suppressions TABLESPACE InnoDB NORMAL mtr/global_suppressions MYSQLD_DATADIR/mtr/global_suppressions.ibd mtr/test_suppressions TABLESPACE InnoDB NORMAL mtr/test_suppressions MYSQLD_DATADIR/mtr/test_suppressions.ibd test/emp#p#east#sp#e0 TABLESPACE InnoDB NORMAL test/emp#p#east#sp#e0 MYSQL_TMP_DIR/alt_dir_east/test/emp#p#east#sp#e0.ibd diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index 4b213946531..f142afa2c50 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -6517,6 +6517,42 @@ static ST_FIELD_INFO innodb_tablespaces_fields_info[] = { }; +/** Get the filepath of tablespace. For multi-file tablespaces (like +system and temporary), return nullptr. Callers owns the responsibility +for freeing the memory of the path returned and should use ut_free() +to free the memory +@param[in] space_id tablespace id +@param[in] flags tablespace flags +@param[in] name tablespace name +@return filepath or nullptr */ +MY_ATTRIBUTE((warn_unused_result)) +static char *i_s_get_filepath(space_id_t space_id, ulint flags, + const char *name) { + char *filepath = nullptr; + + if (fsp_is_system_or_temp_tablespace(space_id)) { + return (filepath); + } + + if (FSP_FLAGS_HAS_DATA_DIR(flags) || FSP_FLAGS_GET_SHARED(flags) || + fsp_is_undo_tablespace(space_id)) { + mutex_enter(&dict_sys->mutex); + filepath = fil_space_get_first_path(space_id); + mutex_exit(&dict_sys->mutex); + } + + if (filepath == nullptr) { + if (strstr(name, dict_sys_t::s_file_per_table_name) != 0) { + mutex_enter(&dict_sys->mutex); + filepath = fil_space_get_first_path(space_id); + mutex_exit(&dict_sys->mutex); + } else { + filepath = Fil_path::make_ibd_from_table_name(name); + } + } + return (filepath); +} + /** Function to fill INFORMATION_SCHEMA.INNODB_TABLESPACES with information collected by scanning INNODB_TABLESPACESS table. @param[in] thd thread @@ -6552,9 +6588,8 @@ static int i_s_dict_fill_innodb_tablespaces( if (fsp_is_undo_tablespace(space_id)) { row_format = "Undo"; - } else if (fsp_is_system_or_temp_tablespace(space_id)) { - row_format = "Compact or Redundant"; - } else if (fsp_is_shared_tablespace(flags) && !is_compressed) { + } else if (fsp_is_system_or_temp_tablespace(space_id) || + (fsp_is_shared_tablespace(flags) && !is_compressed)) { row_format = "Any"; } else if (is_compressed) { row_format = "Compressed"; @@ -6599,22 +6634,7 @@ static int i_s_dict_fill_innodb_tablespaces( OK(fields[INNODB_TABLESPACES_SPACE_VESION]->store(space_version, true)); - char *filepath = NULL; - if (FSP_FLAGS_HAS_DATA_DIR(flags) || FSP_FLAGS_GET_SHARED(flags)) { - mutex_enter(&dict_sys->mutex); - filepath = fil_space_get_first_path(space_id); - mutex_exit(&dict_sys->mutex); - } - - if (filepath == NULL) { - if (strstr(name, dict_sys_t::s_file_per_table_name) != 0) { - mutex_enter(&dict_sys->mutex); - filepath = fil_space_get_first_path(space_id); - mutex_exit(&dict_sys->mutex); - } else { - filepath = Fil_path::make_ibd_from_table_name(name); - } - } + char *filepath = i_s_get_filepath(space_id, flags, name); os_file_stat_t stat; os_file_size_t file; @@ -6713,7 +6733,7 @@ static int i_s_innodb_tablespaces_fill_table(THD *thd, TABLE_LIST *tables, mtr_commit(&mtr); mutex_exit(&dict_sys->mutex); - if (ret && space != 0) { + if (ret) { i_s_dict_fill_innodb_tablespaces(thd, space, name, flags, server_version, space_version, is_encrypted, state.c_str(), tables->table);