Skip to content

Commit ff682ea

Browse files
committed
MDEV-20194 test adjustment for s390x
The test innodb.row_size_error_log_warnings_3 that was added in commit 372b0e6 (MDEV-20194) failed to take into account the earlier adjustment in commit cf574cf (MDEV-27634) that is specific to many GNU/Linux distributions for the s390x.
1 parent c062b35 commit ff682ea

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@ set global innodb_compression_level=1;
5151
CREATE TABLE t1(
5252
f1 INT, f2 CHAR(200), f3 CHAR(200),
5353
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
54-
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200),
55-
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20))
54+
f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
55+
PRIMARY KEY(f1, f2(20), f3(20), f4(20))
5656
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
5757
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
5858
repeat('c', 200), repeat('d', 200),
5959
repeat('d', 200), repeat('e', 200),
60-
repeat('e', 200), repeat('f', 200),
61-
repeat('g', 200) FROM seq_1_to_20;
60+
repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
6261
DROP TABLE t1;
6362
set global innodb_compression_level=default;
6463
CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200),

mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,14 @@ set global innodb_compression_level=1;
4949
CREATE TABLE t1(
5050
f1 INT, f2 CHAR(200), f3 CHAR(200),
5151
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
52-
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200),
53-
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20))
52+
f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
53+
PRIMARY KEY(f1, f2(20), f3(20), f4(20))
5454
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
5555

5656
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
5757
repeat('c', 200), repeat('d', 200),
5858
repeat('d', 200), repeat('e', 200),
59-
repeat('e', 200), repeat('f', 200),
60-
repeat('g', 200) FROM seq_1_to_20;
59+
repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
6160
DROP TABLE t1;
6261
set global innodb_compression_level=default;
6362

0 commit comments

Comments
 (0)