From f3bbf8666e8f59415926086b905263bc86a0e459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 28 Jul 2023 11:27:16 +0300 Subject: [PATCH] MDEV-31790 work-around: Add not_msan.inc --- mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test | 2 ++ mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test | 2 ++ mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test | 2 ++ mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test | 2 ++ mysql-test/suite/rpl/t/rpl_row_mixing_engines.test | 2 ++ mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test | 2 ++ 6 files changed, 12 insertions(+) diff --git a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test index 1df53270b74..ddc7757fa6c 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_mixed.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc let $engine_type=Innodb; diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test index 1f2f8749a0c..d6b278ca13d 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_mixed.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc --disable_query_log diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test index b4552c79349..0161a609738 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_row.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc --disable_query_log diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test index 23552515df7..9944370727e 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_statement.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc --disable_query_log diff --git a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test index c1a13cd9e52..5aa4f2c9925 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_row.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc let $engine_type=Innodb; diff --git a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test index 9cb440b6599..e8b52885624 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test @@ -4,6 +4,8 @@ ################################################################################### --source include/have_binlog_format_statement.inc --source include/have_innodb.inc +# MDEV-31790 FIXME: This test is extremely slow +--source include/not_msan.inc --source include/master-slave.inc let $engine_type=Innodb;