Skip to content

Commit 351b60f

Browse files
committed
MDEV-39488 : Skip Galera test requiring perfschema if -DPLUGIN_PERFSCHEMA=NO
1 parent 6eda0af commit 351b60f

7 files changed

Lines changed: 40 additions & 5 deletions

mysql-test/suite/galera/t/galera_log_bin_sst.inc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,18 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
5353
# Force SST
5454
#
5555
--echo Cleaning var directory ...
56+
--disable_query_log
5657
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
5758
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
58-
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
59+
if (`SELECT count(*) FROM information_schema.engines WHERE
60+
(support = 'YES' OR support = 'DEFAULT') AND
61+
engine = 'PERFORMANCE_SCHEMA'`){
62+
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
63+
}
5964
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
6065
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
6166
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
67+
--enable_query_log
6268

6369
--connection node_2
6470

mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,18 @@ SELECT * FROM `#mysql50#not_lost+found`.t1;
3535
# Force SST
3636
#
3737
--echo Cleaning var directory ...
38+
--disable_query_log
3839
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
3940
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
40-
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
41+
if (`SELECT count(*) FROM information_schema.engines WHERE
42+
(support = 'YES' OR support = 'DEFAULT') AND
43+
engine = 'PERFORMANCE_SCHEMA'`){
44+
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
45+
}
4146
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
4247
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
4348
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
49+
--enable_query_log
4450

4551
--connection node_2
4652

mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,18 @@ COMMIT;
6666
--source include/wait_condition.inc
6767

6868
--echo Cleaning var directory ...
69+
--disable_query_log
6970
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
7071
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
71-
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
72+
if (`SELECT count(*) FROM information_schema.engines WHERE
73+
(support = 'YES' OR support = 'DEFAULT') AND
74+
engine = 'PERFORMANCE_SCHEMA'`){
75+
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
76+
}
7277
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
7378
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
7479
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
80+
--enable_query_log
7581

7682
SET AUTOCOMMIT=OFF;
7783
START TRANSACTION;

mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,18 @@
2020
# Force SST
2121
#
2222
--echo Cleaning var directory ...
23+
--disable_query_log
2324
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
2425
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
25-
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
26+
if (`SELECT count(*) FROM information_schema.engines WHERE
27+
(support = 'YES' OR support = 'DEFAULT') AND
28+
engine = 'PERFORMANCE_SCHEMA'`){
29+
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
30+
}
2631
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
2732
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
2833
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
34+
--enable_query_log
2935

3036
--connection node_2
3137

mysql-test/suite/galera/t/galera_wsrep_new_cluster.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#
66

77
--source include/galera_cluster.inc
8+
# This is needed because we use wsrep-new-cluster
9+
--source include/have_perfschema.inc
810

911
# Save original auto_increment_offset values.
1012
--let $node_1=node_1
@@ -73,12 +75,14 @@ SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
7375
# Force SST
7476
#
7577
--echo Cleaning var directory ...
78+
--disable_query_log
7679
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
7780
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
7881
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
7982
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
8083
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
8184
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
85+
--enable_query_log
8286

8387
--echo Starting server ...
8488
--let $start_mysqld_params=

mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,18 @@ SET GLOBAL wsrep_sst_method = 'mysqldump';
4747
--source include/wait_condition.inc
4848

4949
--echo Cleaning var directory ...
50+
--disable_query_log
5051
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
5152
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mtr
52-
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
53+
if (`SELECT count(*) FROM information_schema.engines WHERE
54+
(support = 'YES' OR support = 'DEFAULT') AND
55+
engine = 'PERFORMANCE_SCHEMA'`){
56+
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
57+
}
5358
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
5459
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
5560
--remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
61+
--enable_query_log
5662

5763
CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
5864
INSERT INTO t1 VALUES (1);

mysql-test/suite/wsrep/t/wsrep_off.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--source include/have_innodb.inc
22
--source include/have_wsrep_provider.inc
33
--source include/have_binlog_format_row.inc
4+
--source include/have_perfschema.inc
45

56
--error ER_GALERA_REPLICATION_NOT_SUPPORTED
67
SET GLOBAL wsrep_on=ON;

0 commit comments

Comments
 (0)