mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix test failures on s390x in test following main.column_compression_rpl

Browse source 
The problem is the test is skipped after sourcing include/master-slave.inc.
This leaves the slave threads running after the test is skipped, causing a
following test to fail during rpl setup.

Also rename have_normal_bzip.inc to the more appropriate _zlib.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen 2024-01-05 13:44:49 +01:00
parent 8a763c014e
commit 5b0a4159ef
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/include/have_normal_bzip.inc → mysql-test/include/have_normal_zlib.inc
View file

@ -1,9 +1,9 @@
--source include/have_compress.inc
# Test that the system is using the default/standard bzip library.
# Test that the system is using the default/standard zlib library.
# If not, we have to skip the test as the compression lengths displayed
# in the test will not match the results from used compression library.
if (`select length(COMPRESS(space(5000))) != 33`) {
skip Test skipped as standard bzip is needed;
skip Test skipped as standard zlib is needed;
}

2
mysql-test/main/column_compression.test
View file

@ -1,6 +1,6 @@
--source include/have_innodb.inc
--source include/have_csv.inc
--source include/have_normal_bzip.inc
--source include/have_normal_zlib.inc
let $MYSQLD_DATADIR= `select @@datadir`;

2
mysql-test/main/column_compression_rpl.test
View file

@ -1,6 +1,6 @@
--source include/have_innodb.inc
--source include/have_normal_zlib.inc
--source include/master-slave.inc
--source include/have_normal_bzip.inc
--let $engine_type= myisam
--let $engine_type2= innodb

2
mysql-test/main/func_compress.test
View file

@ -1,5 +1,5 @@
-- source include/have_compress.inc
-- source include/have_normal_bzip.inc
-- source include/have_normal_zlib.inc
#
# Test for compress and uncompress functions:
#

2
mysql-test/main/mysqlbinlog_row_compressed.test
View file

@ -4,7 +4,7 @@
--source include/have_log_bin.inc
--source include/have_binlog_format_row.inc
--source include/have_normal_bzip.inc
--source include/have_normal_zlib.inc
#
#

2
mysql-test/main/mysqlbinlog_stmt_compressed.test
View file

@ -4,7 +4,7 @@
--source include/have_log_bin.inc
--source include/have_binlog_format_statement.inc
--source include/have_normal_bzip.inc
--source include/have_normal_zlib.inc
#
#
# mysqlbinlog: compressed query event

2
mysql-test/suite/compat/oracle/t/column_compression.test
View file

@ -1,6 +1,6 @@
--source include/have_innodb.inc
--source include/have_csv.inc
--source include/have_normal_bzip.inc
--source include/have_normal_zlib.inc
SET sql_mode=ORACLE;

2
mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test
View file

@ -1,7 +1,7 @@
--source include/have_innodb.inc
--source include/have_sequence.inc
--source include/innodb_page_size_small.inc
--source include/have_normal_bzip.inc
--source include/have_normal_zlib.inc
call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page.");