Skip to content

Commit e9a47b2

Browse files
committed
Fix three failing test cases since the commit for bug#20595292 - rb8145.
innodb-wl5980-linux failed on linux only. restart.test and innodb-system-table-view.test failed when innodb-page-size was not 16k.
1 parent 75fd4b3 commit e9a47b2

File tree

5 files changed

+53
-53
lines changed

5 files changed

+53
-53
lines changed

mysql-test/suite/innodb/r/innodb-system-table-view.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,20 @@ ID FOR_COL_NAME REF_COL_NAME POS
149149
DROP TABLE IF EXISTS t_redundant, t_compact, t_compressed, t_dynamic;
150150
CREATE TABLE t_redundant (a INT KEY, b TEXT) ROW_FORMAT=REDUNDANT ENGINE=innodb;
151151
CREATE TABLE t_compact (a INT KEY, b TEXT) ROW_FORMAT=COMPACT ENGINE=innodb;
152-
CREATE TABLE t_compressed (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb;
152+
CREATE TABLE t_compressed (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb KEY_BLOCK_SIZE=2;
153153
CREATE TABLE t_dynamic (a INT KEY, b TEXT) ROW_FORMAT=DYNAMIC ENGINE=innodb;
154154
=== information_schema.innodb_sys_tables and innodb_sys_tablespaces ===
155155
Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type
156156
test/t_compact test/t_compact 1 5 Compact 0 Single
157-
test/t_compressed test/t_compressed 41 5 Compressed 8192 Single
157+
test/t_compressed test/t_compressed 37 5 Compressed 2048 Single
158158
test/t_dynamic test/t_dynamic 33 5 Dynamic 0 Single
159159
test/t_redundant test/t_redundant 0 5 Redundant 0 Single
160160
=== information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
161161
Space Name Path Page Size Zip Size Formats Permitted Space Type
162162
innodb_system MYSQLD_DATADIR/ibdata1 DEFAULT 0 Compact or Redundant System
163163
test/t_redundant MYSQLD_DATADIR/test/t_redundant.ibd DEFAULT 0 Compact or Redundant Single
164164
test/t_compact MYSQLD_DATADIR/test/t_compact.ibd DEFAULT 0 Compact or Redundant Single
165-
test/t_compressed MYSQLD_DATADIR/test/t_compressed.ibd DEFAULT 8192 Compressed Single
165+
test/t_compressed MYSQLD_DATADIR/test/t_compressed.ibd DEFAULT 2048 Compressed Single
166166
test/t_dynamic MYSQLD_DATADIR/test/t_dynamic.ibd DEFAULT 0 Dynamic Single
167167
DROP TABLE t_redundant, t_compact, t_compressed, t_dynamic;
168168
SELECT count(*) FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;

mysql-test/suite/innodb/r/innodb-wl5980-linux.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ COUNT(*)
143143
=== information_schema.innodb_sys_tablespaces and innodb_sys_datafiles ===
144144
Space Name Path Page Size Zip Size Formats Permitted Space Type
145145
innodb_system MYSQLD_DATADIR/ibdata1 DEFAULT 0 Compact or Redundant System
146-
test/emp1 MYSQLD_DATADIR/test/emp1.ibd DEFAULT 0 Compact or Redundant Single
146+
test/emp1 .\test\emp1.ibd DEFAULT 0 Compact or Redundant Single
147147
test/emp2#p#p1 MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd DEFAULT 0 Compact or Redundant Single
148148
test/emp2#p#p2 MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd DEFAULT 0 Compact or Redundant Single
149149
test/emp3 MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd DEFAULT 0 Compact or Redundant Single

mysql-test/suite/innodb/t/innodb-system-table-view.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ DROP TABLE IF EXISTS t_redundant, t_compact, t_compressed, t_dynamic;
5151

5252
CREATE TABLE t_redundant (a INT KEY, b TEXT) ROW_FORMAT=REDUNDANT ENGINE=innodb;
5353
CREATE TABLE t_compact (a INT KEY, b TEXT) ROW_FORMAT=COMPACT ENGINE=innodb;
54-
CREATE TABLE t_compressed (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb;
54+
CREATE TABLE t_compressed (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb KEY_BLOCK_SIZE=2;
5555
CREATE TABLE t_dynamic (a INT KEY, b TEXT) ROW_FORMAT=DYNAMIC ENGINE=innodb;
5656

5757
--source suite/innodb/include/show_i_s_tables.inc

0 commit comments

Comments
 (0)