From ff682eada8a9648a2e40fc56c45d45f84cfb39f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 22 Aug 2023 09:00:51 +0300 Subject: [PATCH] MDEV-20194 test adjustment for s390x The test innodb.row_size_error_log_warnings_3 that was added in commit 372b0e6355fbb6b7dc490b64da13e784c09aeec8 (MDEV-20194) failed to take into account the earlier adjustment in commit cf574cf53b168992b911d5fc32c590a6ee03a56a (MDEV-27634) that is specific to many GNU/Linux distributions for the s390x. --- .../suite/innodb/r/row_size_error_log_warnings_3.result | 7 +++---- .../suite/innodb/t/row_size_error_log_warnings_3.test | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result b/mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result index d00ac938310..21085e4cd7e 100644 --- a/mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result +++ b/mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result @@ -51,14 +51,13 @@ set global innodb_compression_level=1; CREATE TABLE t1( f1 INT, f2 CHAR(200), f3 CHAR(200), f4 CHAR(200), f5 CHAR(200), f6 CHAR(200), -f7 CHAR(200), f8 CHAR(200), f9 CHAR(200), -f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20)) +f7 CHAR(200), f8 CHAR(200), f9 CHAR(106), +PRIMARY KEY(f1, f2(20), f3(20), f4(20)) ) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB; INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200), repeat('c', 200), repeat('d', 200), repeat('d', 200), repeat('e', 200), -repeat('e', 200), repeat('f', 200), -repeat('g', 200) FROM seq_1_to_20; +repeat('f', 200), repeat('g', 106) FROM seq_1_to_20; DROP TABLE t1; set global innodb_compression_level=default; CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200), diff --git a/mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test b/mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test index 209c86a29b5..39694c05e0f 100644 --- a/mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test +++ b/mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test @@ -49,15 +49,14 @@ set global innodb_compression_level=1; CREATE TABLE t1( f1 INT, f2 CHAR(200), f3 CHAR(200), f4 CHAR(200), f5 CHAR(200), f6 CHAR(200), - f7 CHAR(200), f8 CHAR(200), f9 CHAR(200), - f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20)) + f7 CHAR(200), f8 CHAR(200), f9 CHAR(106), + PRIMARY KEY(f1, f2(20), f3(20), f4(20)) ) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB; INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200), repeat('c', 200), repeat('d', 200), repeat('d', 200), repeat('e', 200), - repeat('e', 200), repeat('f', 200), - repeat('g', 200) FROM seq_1_to_20; + repeat('f', 200), repeat('g', 106) FROM seq_1_to_20; DROP TABLE t1; set global innodb_compression_level=default;