database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-20194 test adjustment for s390x

Browse Source 
The test innodb.row_size_error_log_warnings_3 that was added in
commit 372b0e6355 (MDEV-20194)
failed to take into account the earlier adjustment in
commit cf574cf53b (MDEV-27634)
that is specific to many GNU/Linux distributions for the s390x.
This commit is contained in:
Marko Mäkelä
2023-08-22 09:00:51 +03:00
parent c062b351f0
commit ff682eada8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result
View File

@@ -51,14 +51,13 @@ set global innodb_compression_level=1;
CREATE TABLE t1( CREATE TABLE t1(
f1 INT, f2 CHAR(200), f3 CHAR(200), f1 INT, f2 CHAR(200), f3 CHAR(200),
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200), f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200), f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20)) PRIMARY KEY(f1, f2(20), f3(20), f4(20))
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB; ) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200), INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
repeat('c', 200), repeat('d', 200), repeat('c', 200), repeat('d', 200),
repeat('d', 200), repeat('e', 200), repeat('d', 200), repeat('e', 200),
repeat('e', 200), repeat('f', 200), repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
repeat('g', 200) FROM seq_1_to_20;
DROP TABLE t1; DROP TABLE t1;
set global innodb_compression_level=default; set global innodb_compression_level=default;
CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200), CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200),

7
mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test
View File

@@ -49,15 +49,14 @@ set global innodb_compression_level=1;
CREATE TABLE t1( CREATE TABLE t1(
f1 INT, f2 CHAR(200), f3 CHAR(200), f1 INT, f2 CHAR(200), f3 CHAR(200),
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200), f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200), f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20)) PRIMARY KEY(f1, f2(20), f3(20), f4(20))
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB; ) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200), INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
repeat('c', 200), repeat('d', 200), repeat('c', 200), repeat('d', 200),
repeat('d', 200), repeat('e', 200), repeat('d', 200), repeat('e', 200),
repeat('e', 200), repeat('f', 200), repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
repeat('g', 200) FROM seq_1_to_20;
DROP TABLE t1; DROP TABLE t1;
set global innodb_compression_level=default; set global innodb_compression_level=default;