From 907e7ed966c47e09b7d80f9b7266c3bfccb00250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 30 Apr 2026 09:27:10 +0300 Subject: [PATCH] MDEV-39488 : Skip Galera test requiring perfschema if -DPLUGIN_PERFSCHEMA=NO --- mysql-test/suite/galera/t/galera_log_bin_sst.inc | 1 + mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test | 1 + .../suite/galera/t/galera_sst_mariabackup_table_options.test | 1 + mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test | 1 + mysql-test/suite/galera/t/galera_wsrep_new_cluster.test | 1 + mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test | 1 + mysql-test/suite/wsrep/t/wsrep_off.test | 1 + 7 files changed, 7 insertions(+) diff --git a/mysql-test/suite/galera/t/galera_log_bin_sst.inc b/mysql-test/suite/galera/t/galera_log_bin_sst.inc index 87420ad539f7e..2aa740417e550 100644 --- a/mysql-test/suite/galera/t/galera_log_bin_sst.inc +++ b/mysql-test/suite/galera/t/galera_log_bin_sst.inc @@ -1,5 +1,6 @@ --source include/galera_cluster.inc --source include/force_restart.inc +-- source include/have_perfschema.inc # Save original auto_increment_offset values. --let $node_1=node_1 diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test index e8dcbd849d82f..0821c3a4b9cd5 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test @@ -1,6 +1,7 @@ --source include/galera_cluster.inc --source include/have_innodb.inc --source include/have_mariabackup.inc +--source include/have_perfschema.inc # Save original auto_increment_offset values. --let $node_1=node_1 diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test index 7a3a6c825c497..4ce5ea9201c2e 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test @@ -4,6 +4,7 @@ --source include/innodb_encrypt_tables.inc --source include/innodb_page_size_small.inc --source include/have_mariabackup.inc +--source include/have_perfschema.inc # Save original auto_increment_offset values. --let $node_1=node_1 diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test index bbc689b03edfb..76d3b5c4c39c0 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test @@ -1,6 +1,7 @@ --source include/galera_cluster.inc --source include/have_innodb.inc --source include/have_mariabackup.inc +--source include/have_perfschema.inc # Save original auto_increment_offset values. --let $node_1=node_1 diff --git a/mysql-test/suite/galera/t/galera_wsrep_new_cluster.test b/mysql-test/suite/galera/t/galera_wsrep_new_cluster.test index cfa5f8bceadb6..5c33a0bdf6f14 100644 --- a/mysql-test/suite/galera/t/galera_wsrep_new_cluster.test +++ b/mysql-test/suite/galera/t/galera_wsrep_new_cluster.test @@ -5,6 +5,7 @@ # --source include/galera_cluster.inc +--source include/have_perfschema.inc # Save original auto_increment_offset values. --let $node_1=node_1 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test index 12399840896b3..ace8fee4dcdee 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test @@ -2,6 +2,7 @@ --source include/galera_cluster.inc --source include/check_ipv6.inc --source include/force_restart.inc +--source include/have_perfschema.inc call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'"); call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos"); diff --git a/mysql-test/suite/wsrep/t/wsrep_off.test b/mysql-test/suite/wsrep/t/wsrep_off.test index 27e64c92e9302..3a73434c9e47b 100644 --- a/mysql-test/suite/wsrep/t/wsrep_off.test +++ b/mysql-test/suite/wsrep/t/wsrep_off.test @@ -1,6 +1,7 @@ --source include/have_innodb.inc --source include/have_wsrep_provider.inc --source include/have_binlog_format_row.inc +--source include/have_perfschema.inc --error ER_GALERA_REPLICATION_NOT_SUPPORTED SET GLOBAL wsrep_on=ON;