Skip to content

Commit c527e60

Browse files
kdjakevinkdjakevin
committed
Merge branch 'mysql-5.7-bug20595292' into mysql-5.7
2 parents 1ea93e2 + 4272f07 commit c527e60

32 files changed

+1259
-1962
lines changed

‎mysql-test/suite/innodb/include/show_i_s_tables.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ SELECT t.name 'Table Name',
55
s.name 'Tablespace',
66
t.flag 'Table Flags',
77
t.n_cols 'Columns',
8-
t.file_format 'File Format',
98
t.row_format 'Row Format',
109
t.zip_page_size 'Zip Size',
1110
t.space_type 'Space Type'
1211
FROM information_schema.innodb_sys_tables t,
1312
information_schema.innodb_sys_tablespaces s
1413
WHERE t.space = s.space
1514
AND t.name not like 'SYS_%'
16-
AND t.name not like 'mysql/%'
15+
AND t.name not like 'mysql\/%'
1716
ORDER BY t.name;
1817
--enable_query_log
1918

‎mysql-test/suite/innodb/include/show_i_s_tablespaces.inc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# LET $INNODB_PAGE_SIZE = `select @@innodb_page_size`;
44
--echo === information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
55
--disable_query_log
6-
--replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR/ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR/ $MYSQL_TMP_DIR MYSQL_TMP_DIR $INNODB_PAGE_SIZE DEFAULT
6+
--replace_result #P# #p# #SP# #sp# ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR/ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR/ $MYSQL_TMP_DIR MYSQL_TMP_DIR $INNODB_PAGE_SIZE DEFAULT
77
SELECT s.name 'Space Name',
88
d.path 'Path',
99
s.page_size 'Page Size',
@@ -12,7 +12,8 @@ SELECT s.name 'Space Name',
1212
s.space_type 'Space Type'
1313
FROM information_schema.innodb_sys_tablespaces s,
1414
information_schema.innodb_sys_datafiles d
15-
WHERE s.name not like 'mysql/%'
16-
AND s.space = d.space
15+
WHERE s.space = d.space
16+
AND s.name NOT LIKE 'SYS_%'
17+
AND s.name NOT LIKE 'mysql\/%'
1718
ORDER BY s.space;
1819
--enable_query_log

‎mysql-test/suite/innodb/r/create_tablespace.result

Lines changed: 123 additions & 123 deletions
Large diffs are not rendered by default.

‎mysql-test/suite/innodb/r/create_tablespace_16k.result

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -392,34 +392,34 @@ s_4k MYSQLD_DATADIR/s_4k.ibd DEFAULT 4096 Compressed General
392392
s_8k MYSQLD_DATADIR/s_8k.ibd DEFAULT 8192 Compressed General
393393
s_16k MYSQLD_DATADIR/s_16k.ibd DEFAULT 0 Any General
394394
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
395-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
396-
test/t_com_in_16k s_16k 129 5 Antelope Compact 0 General
397-
test/t_com_in_16k_as s_16k 129 5 Antelope Compact 0 General
398-
test/t_com_in_16k_from_1k s_16k 129 5 Antelope Compact 0 General
399-
test/t_com_in_16k_like s_16k 129 5 Antelope Compact 0 General
400-
test/t_dyn_in_16k s_16k 161 5 Barracuda Dynamic 0 General
401-
test/t_dyn_in_16k_as s_16k 161 5 Barracuda Dynamic 0 General
402-
test/t_dyn_in_16k_from_1k s_16k 161 5 Barracuda Dynamic 0 General
403-
test/t_dyn_in_16k_like s_16k 161 5 Barracuda Dynamic 0 General
404-
test/t_red_in_16k s_16k 128 5 Antelope Redundant 0 General
405-
test/t_red_in_16k_as s_16k 128 5 Antelope Redundant 0 General
406-
test/t_red_in_16k_from_1k s_16k 128 5 Antelope Redundant 0 General
407-
test/t_red_in_16k_like s_16k 128 5 Antelope Redundant 0 General
408-
test/t_zip1k_in_1k s_1k 163 5 Barracuda Compressed 1024 General
409-
test/t_zip1k_in_1k_as s_1k 163 5 Barracuda Compressed 1024 General
410-
test/t_zip1k_in_1k_like s_1k 163 5 Barracuda Compressed 1024 General
411-
test/t_zip2k_in_2k s_2k 165 5 Barracuda Compressed 2048 General
412-
test/t_zip2k_in_2k_as s_2k 165 5 Barracuda Compressed 2048 General
413-
test/t_zip2k_in_2k_from_1k s_2k 165 5 Barracuda Compressed 2048 General
414-
test/t_zip2k_in_2k_like s_2k 165 5 Barracuda Compressed 2048 General
415-
test/t_zip4k_in_4k s_4k 167 5 Barracuda Compressed 4096 General
416-
test/t_zip4k_in_4k_as s_4k 167 5 Barracuda Compressed 4096 General
417-
test/t_zip4k_in_4k_from_1k s_4k 167 5 Barracuda Compressed 4096 General
418-
test/t_zip4k_in_4k_like s_4k 167 5 Barracuda Compressed 4096 General
419-
test/t_zip8k_in_8k s_8k 169 5 Barracuda Compressed 8192 General
420-
test/t_zip8k_in_8k_as s_8k 169 5 Barracuda Compressed 8192 General
421-
test/t_zip8k_in_8k_from_1k s_8k 169 5 Barracuda Compressed 8192 General
422-
test/t_zip8k_in_8k_like s_8k 169 5 Barracuda Compressed 8192 General
395+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
396+
test/t_com_in_16k s_16k 129 5 Compact 0 General
397+
test/t_com_in_16k_as s_16k 129 5 Compact 0 General
398+
test/t_com_in_16k_from_1k s_16k 129 5 Compact 0 General
399+
test/t_com_in_16k_like s_16k 129 5 Compact 0 General
400+
test/t_dyn_in_16k s_16k 161 5 Dynamic 0 General
401+
test/t_dyn_in_16k_as s_16k 161 5 Dynamic 0 General
402+
test/t_dyn_in_16k_from_1k s_16k 161 5 Dynamic 0 General
403+
test/t_dyn_in_16k_like s_16k 161 5 Dynamic 0 General
404+
test/t_red_in_16k s_16k 128 5 Redundant 0 General
405+
test/t_red_in_16k_as s_16k 128 5 Redundant 0 General
406+
test/t_red_in_16k_from_1k s_16k 128 5 Redundant 0 General
407+
test/t_red_in_16k_like s_16k 128 5 Redundant 0 General
408+
test/t_zip1k_in_1k s_1k 163 5 Compressed 1024 General
409+
test/t_zip1k_in_1k_as s_1k 163 5 Compressed 1024 General
410+
test/t_zip1k_in_1k_like s_1k 163 5 Compressed 1024 General
411+
test/t_zip2k_in_2k s_2k 165 5 Compressed 2048 General
412+
test/t_zip2k_in_2k_as s_2k 165 5 Compressed 2048 General
413+
test/t_zip2k_in_2k_from_1k s_2k 165 5 Compressed 2048 General
414+
test/t_zip2k_in_2k_like s_2k 165 5 Compressed 2048 General
415+
test/t_zip4k_in_4k s_4k 167 5 Compressed 4096 General
416+
test/t_zip4k_in_4k_as s_4k 167 5 Compressed 4096 General
417+
test/t_zip4k_in_4k_from_1k s_4k 167 5 Compressed 4096 General
418+
test/t_zip4k_in_4k_like s_4k 167 5 Compressed 4096 General
419+
test/t_zip8k_in_8k s_8k 169 5 Compressed 8192 General
420+
test/t_zip8k_in_8k_as s_8k 169 5 Compressed 8192 General
421+
test/t_zip8k_in_8k_from_1k s_8k 169 5 Compressed 8192 General
422+
test/t_zip8k_in_8k_like s_8k 169 5 Compressed 8192 General
423423
# Directory of MYSQLD_DATADIR/
424424
s_16k.ibd
425425
s_1k.ibd
@@ -440,34 +440,34 @@ s_4k MYSQLD_DATADIR/s_4k.ibd DEFAULT 4096 Compressed General
440440
s_8k MYSQLD_DATADIR/s_8k.ibd DEFAULT 8192 Compressed General
441441
s_16k MYSQLD_DATADIR/s_16k.ibd DEFAULT 0 Any General
442442
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
443-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
444-
test/t_com_in_16k s_16k 129 5 Antelope Compact 0 General
445-
test/t_com_in_16k_as s_16k 129 5 Antelope Compact 0 General
446-
test/t_com_in_16k_from_1k s_16k 129 5 Antelope Compact 0 General
447-
test/t_com_in_16k_like s_16k 129 5 Antelope Compact 0 General
448-
test/t_dyn_in_16k s_16k 161 5 Barracuda Dynamic 0 General
449-
test/t_dyn_in_16k_as s_16k 161 5 Barracuda Dynamic 0 General
450-
test/t_dyn_in_16k_from_1k s_16k 161 5 Barracuda Dynamic 0 General
451-
test/t_dyn_in_16k_like s_16k 161 5 Barracuda Dynamic 0 General
452-
test/t_red_in_16k s_16k 128 5 Antelope Redundant 0 General
453-
test/t_red_in_16k_as s_16k 128 5 Antelope Redundant 0 General
454-
test/t_red_in_16k_from_1k s_16k 128 5 Antelope Redundant 0 General
455-
test/t_red_in_16k_like s_16k 128 5 Antelope Redundant 0 General
456-
test/t_zip1k_in_1k s_1k 163 5 Barracuda Compressed 1024 General
457-
test/t_zip1k_in_1k_as s_1k 163 5 Barracuda Compressed 1024 General
458-
test/t_zip1k_in_1k_like s_1k 163 5 Barracuda Compressed 1024 General
459-
test/t_zip2k_in_2k s_2k 165 5 Barracuda Compressed 2048 General
460-
test/t_zip2k_in_2k_as s_2k 165 5 Barracuda Compressed 2048 General
461-
test/t_zip2k_in_2k_from_1k s_2k 165 5 Barracuda Compressed 2048 General
462-
test/t_zip2k_in_2k_like s_2k 165 5 Barracuda Compressed 2048 General
463-
test/t_zip4k_in_4k s_4k 167 5 Barracuda Compressed 4096 General
464-
test/t_zip4k_in_4k_as s_4k 167 5 Barracuda Compressed 4096 General
465-
test/t_zip4k_in_4k_from_1k s_4k 167 5 Barracuda Compressed 4096 General
466-
test/t_zip4k_in_4k_like s_4k 167 5 Barracuda Compressed 4096 General
467-
test/t_zip8k_in_8k s_8k 169 5 Barracuda Compressed 8192 General
468-
test/t_zip8k_in_8k_as s_8k 169 5 Barracuda Compressed 8192 General
469-
test/t_zip8k_in_8k_from_1k s_8k 169 5 Barracuda Compressed 8192 General
470-
test/t_zip8k_in_8k_like s_8k 169 5 Barracuda Compressed 8192 General
443+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
444+
test/t_com_in_16k s_16k 129 5 Compact 0 General
445+
test/t_com_in_16k_as s_16k 129 5 Compact 0 General
446+
test/t_com_in_16k_from_1k s_16k 129 5 Compact 0 General
447+
test/t_com_in_16k_like s_16k 129 5 Compact 0 General
448+
test/t_dyn_in_16k s_16k 161 5 Dynamic 0 General
449+
test/t_dyn_in_16k_as s_16k 161 5 Dynamic 0 General
450+
test/t_dyn_in_16k_from_1k s_16k 161 5 Dynamic 0 General
451+
test/t_dyn_in_16k_like s_16k 161 5 Dynamic 0 General
452+
test/t_red_in_16k s_16k 128 5 Redundant 0 General
453+
test/t_red_in_16k_as s_16k 128 5 Redundant 0 General
454+
test/t_red_in_16k_from_1k s_16k 128 5 Redundant 0 General
455+
test/t_red_in_16k_like s_16k 128 5 Redundant 0 General
456+
test/t_zip1k_in_1k s_1k 163 5 Compressed 1024 General
457+
test/t_zip1k_in_1k_as s_1k 163 5 Compressed 1024 General
458+
test/t_zip1k_in_1k_like s_1k 163 5 Compressed 1024 General
459+
test/t_zip2k_in_2k s_2k 165 5 Compressed 2048 General
460+
test/t_zip2k_in_2k_as s_2k 165 5 Compressed 2048 General
461+
test/t_zip2k_in_2k_from_1k s_2k 165 5 Compressed 2048 General
462+
test/t_zip2k_in_2k_like s_2k 165 5 Compressed 2048 General
463+
test/t_zip4k_in_4k s_4k 167 5 Compressed 4096 General
464+
test/t_zip4k_in_4k_as s_4k 167 5 Compressed 4096 General
465+
test/t_zip4k_in_4k_from_1k s_4k 167 5 Compressed 4096 General
466+
test/t_zip4k_in_4k_like s_4k 167 5 Compressed 4096 General
467+
test/t_zip8k_in_8k s_8k 169 5 Compressed 8192 General
468+
test/t_zip8k_in_8k_as s_8k 169 5 Compressed 8192 General
469+
test/t_zip8k_in_8k_from_1k s_8k 169 5 Compressed 8192 General
470+
test/t_zip8k_in_8k_like s_8k 169 5 Compressed 8192 General
471471
# Directory of MYSQLD_DATADIR/
472472
s_16k.ibd
473473
s_1k.ibd
@@ -561,17 +561,17 @@ test/t_zip4k_as_remote MYSQL_TMP_DIR/test/t_zip4k_as_remote.ibd DEFAULT 4096 Com
561561
test/t_zip8k_as_remote MYSQL_TMP_DIR/test/t_zip8k_as_remote.ibd DEFAULT 8192 Compressed Single
562562
test/t_zip16k_as_remote MYSQL_TMP_DIR/test/t_zip16k_as_remote.ibd DEFAULT DEFAULT Compressed Single
563563
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
564-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
565-
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Barracuda Compressed 16384 Single
566-
test/t_zip16k_as_remote test/t_zip16k_as_remote 107 5 Barracuda Compressed 16384 Single
567-
test/t_zip1k_as_file_per_table test/t_zip1k_as_file_per_table 35 5 Barracuda Compressed 1024 Single
568-
test/t_zip1k_as_remote test/t_zip1k_as_remote 99 5 Barracuda Compressed 1024 Single
569-
test/t_zip2k_as_file_per_table test/t_zip2k_as_file_per_table 37 5 Barracuda Compressed 2048 Single
570-
test/t_zip2k_as_remote test/t_zip2k_as_remote 101 5 Barracuda Compressed 2048 Single
571-
test/t_zip4k_as_file_per_table test/t_zip4k_as_file_per_table 39 5 Barracuda Compressed 4096 Single
572-
test/t_zip4k_as_remote test/t_zip4k_as_remote 103 5 Barracuda Compressed 4096 Single
573-
test/t_zip8k_as_file_per_table test/t_zip8k_as_file_per_table 41 5 Barracuda Compressed 8192 Single
574-
test/t_zip8k_as_remote test/t_zip8k_as_remote 105 5 Barracuda Compressed 8192 Single
564+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
565+
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Compressed 16384 Single
566+
test/t_zip16k_as_remote test/t_zip16k_as_remote 107 5 Compressed 16384 Single
567+
test/t_zip1k_as_file_per_table test/t_zip1k_as_file_per_table 35 5 Compressed 1024 Single
568+
test/t_zip1k_as_remote test/t_zip1k_as_remote 99 5 Compressed 1024 Single
569+
test/t_zip2k_as_file_per_table test/t_zip2k_as_file_per_table 37 5 Compressed 2048 Single
570+
test/t_zip2k_as_remote test/t_zip2k_as_remote 101 5 Compressed 2048 Single
571+
test/t_zip4k_as_file_per_table test/t_zip4k_as_file_per_table 39 5 Compressed 4096 Single
572+
test/t_zip4k_as_remote test/t_zip4k_as_remote 103 5 Compressed 4096 Single
573+
test/t_zip8k_as_file_per_table test/t_zip8k_as_file_per_table 41 5 Compressed 8192 Single
574+
test/t_zip8k_as_remote test/t_zip8k_as_remote 105 5 Compressed 8192 Single
575575
# MYSQLD_DATADIR/
576576
s_16k.ibd
577577
s_1k.ibd
@@ -864,16 +864,16 @@ s_8k MYSQLD_DATADIR/s_8k.ibd DEFAULT 8192 Compressed General
864864
s_16k MYSQLD_DATADIR/s_16k.ibd DEFAULT 0 Any General
865865
test/t_zip16k_as_file_per_table MYSQLD_DATADIR/test/t_zip16k_as_file_per_table.ibd DEFAULT DEFAULT Compressed Single
866866
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
867-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
868-
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Barracuda Compressed 16384 Single
869-
test/t_zip1k_in_s_1k s_1k 163 5 Barracuda Compressed 1024 General
870-
test/t_zip1k_remote_in_s_1k s_1k 163 5 Barracuda Compressed 1024 General
871-
test/t_zip2k_in_s_2k s_2k 165 5 Barracuda Compressed 2048 General
872-
test/t_zip2k_remote_in_s_2k s_2k 165 5 Barracuda Compressed 2048 General
873-
test/t_zip4k_in_s_4k s_4k 167 5 Barracuda Compressed 4096 General
874-
test/t_zip4k_remote_in_s_4k s_4k 167 5 Barracuda Compressed 4096 General
875-
test/t_zip8k_in_s_8k s_8k 169 5 Barracuda Compressed 8192 General
876-
test/t_zip8k_remote_in_s_8k s_8k 169 5 Barracuda Compressed 8192 General
867+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
868+
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Compressed 16384 Single
869+
test/t_zip1k_in_s_1k s_1k 163 5 Compressed 1024 General
870+
test/t_zip1k_remote_in_s_1k s_1k 163 5 Compressed 1024 General
871+
test/t_zip2k_in_s_2k s_2k 165 5 Compressed 2048 General
872+
test/t_zip2k_remote_in_s_2k s_2k 165 5 Compressed 2048 General
873+
test/t_zip4k_in_s_4k s_4k 167 5 Compressed 4096 General
874+
test/t_zip4k_remote_in_s_4k s_4k 167 5 Compressed 4096 General
875+
test/t_zip8k_in_s_8k s_8k 169 5 Compressed 8192 General
876+
test/t_zip8k_remote_in_s_8k s_8k 169 5 Compressed 8192 General
877877
# MYSQLD_DATADIR/
878878
s_16k.ibd
879879
s_1k.ibd
@@ -1028,16 +1028,16 @@ test/t_zip2k_to_file_per_table MYSQLD_DATADIR/test/t_zip2k_to_file_per_table.ibd
10281028
test/t_zip4k_to_file_per_table MYSQLD_DATADIR/test/t_zip4k_to_file_per_table.ibd DEFAULT 4096 Compressed Single
10291029
test/t_zip8k_to_file_per_table MYSQLD_DATADIR/test/t_zip8k_to_file_per_table.ibd DEFAULT 8192 Compressed Single
10301030
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
1031-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
1032-
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Barracuda Compressed 16384 Single
1033-
test/t_zip1k_remote_in_s_1k s_1k 163 5 Barracuda Compressed 1024 General
1034-
test/t_zip1k_to_file_per_table test/t_zip1k_to_file_per_table 35 5 Barracuda Compressed 1024 Single
1035-
test/t_zip2k_remote_in_s_2k s_2k 165 5 Barracuda Compressed 2048 General
1036-
test/t_zip2k_to_file_per_table test/t_zip2k_to_file_per_table 37 5 Barracuda Compressed 2048 Single
1037-
test/t_zip4k_remote_in_s_4k s_4k 167 5 Barracuda Compressed 4096 General
1038-
test/t_zip4k_to_file_per_table test/t_zip4k_to_file_per_table 39 5 Barracuda Compressed 4096 Single
1039-
test/t_zip8k_remote_in_s_8k s_8k 169 5 Barracuda Compressed 8192 General
1040-
test/t_zip8k_to_file_per_table test/t_zip8k_to_file_per_table 41 5 Barracuda Compressed 8192 Single
1031+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
1032+
test/t_zip16k_as_file_per_table test/t_zip16k_as_file_per_table 43 5 Compressed 16384 Single
1033+
test/t_zip1k_remote_in_s_1k s_1k 163 5 Compressed 1024 General
1034+
test/t_zip1k_to_file_per_table test/t_zip1k_to_file_per_table 35 5 Compressed 1024 Single
1035+
test/t_zip2k_remote_in_s_2k s_2k 165 5 Compressed 2048 General
1036+
test/t_zip2k_to_file_per_table test/t_zip2k_to_file_per_table 37 5 Compressed 2048 Single
1037+
test/t_zip4k_remote_in_s_4k s_4k 167 5 Compressed 4096 General
1038+
test/t_zip4k_to_file_per_table test/t_zip4k_to_file_per_table 39 5 Compressed 4096 Single
1039+
test/t_zip8k_remote_in_s_8k s_8k 169 5 Compressed 8192 General
1040+
test/t_zip8k_to_file_per_table test/t_zip8k_to_file_per_table 41 5 Compressed 8192 Single
10411041
CHECK TABLE `t_zip1k_to_file_per_table`;
10421042
Table Op Msg_type Msg_text
10431043
test.t_zip1k_to_file_per_table check status OK
@@ -1087,11 +1087,11 @@ test/t_zip2k_to_file_per_table MYSQLD_DATADIR/test/t_zip2k_to_file_per_table.ibd
10871087
test/t_zip4k_to_file_per_table MYSQLD_DATADIR/test/t_zip4k_to_file_per_table.ibd DEFAULT 4096 Compressed Single
10881088
test/t_zip8k_to_file_per_table MYSQLD_DATADIR/test/t_zip8k_to_file_per_table.ibd DEFAULT 8192 Compressed Single
10891089
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
1090-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
1091-
test/t_zip1k_to_file_per_table test/t_zip1k_to_file_per_table 35 5 Barracuda Compressed 1024 Single
1092-
test/t_zip2k_to_file_per_table test/t_zip2k_to_file_per_table 37 5 Barracuda Compressed 2048 Single
1093-
test/t_zip4k_to_file_per_table test/t_zip4k_to_file_per_table 39 5 Barracuda Compressed 4096 Single
1094-
test/t_zip8k_to_file_per_table test/t_zip8k_to_file_per_table 41 5 Barracuda Compressed 8192 Single
1090+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
1091+
test/t_zip1k_to_file_per_table test/t_zip1k_to_file_per_table 35 5 Compressed 1024 Single
1092+
test/t_zip2k_to_file_per_table test/t_zip2k_to_file_per_table 37 5 Compressed 2048 Single
1093+
test/t_zip4k_to_file_per_table test/t_zip4k_to_file_per_table 39 5 Compressed 4096 Single
1094+
test/t_zip8k_to_file_per_table test/t_zip8k_to_file_per_table 41 5 Compressed 8192 Single
10951095
DROP TABLE `t_zip1k_to_file_per_table`;
10961096
DROP TABLE `t_zip2k_to_file_per_table`;
10971097
DROP TABLE `t_zip4k_to_file_per_table`;

‎mysql-test/suite/innodb/r/create_tablespace_32k.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ Space Name Path Page Size Zip Size Formats Permitted Space Type
133133
innodb_system MYSQLD_DATADIR/ibdata1 DEFAULT 0 Compact or Redundant System
134134
s_32k MYSQLD_DATADIR/s_32k.ibd DEFAULT 0 Any General
135135
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
136-
Table Name Tablespace Table Flags Columns File Format Row Format Zip Size Space Type
137-
test/t_com_in_32k s_32k 129 5 Antelope Compact 0 General
138-
test/t_dyn_in_32k s_32k 161 5 Barracuda Dynamic 0 General
139-
test/t_red_in_32k s_32k 128 5 Antelope Redundant 0 General
136+
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
137+
test/t_com_in_32k s_32k 129 5 Compact 0 General
138+
test/t_dyn_in_32k s_32k 161 5 Dynamic 0 General
139+
test/t_red_in_32k s_32k 128 5 Redundant 0 General
140140
# Directory of MYSQLD_DATADIR/
141141
s_32k.ibd
142142
# Directory of MYSQLD_DATADIR/test/

0 commit comments

Comments
 (0)