diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2019-07-18 14:56:39 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2019-07-18 14:56:39 +0200 |
| commit | c0eb3a4d9230b0242c48107b8aea8580fce219b5 (patch) | |
| tree | 34516acf586867b7db0dc09d6b782acc81ac2ab5 | |
| parent | 69628551858825bebc3f1653882920e4f6555cbb (diff) | |
| download | mariadb-git-c0eb3a4d9230b0242c48107b8aea8580fce219b5.tar.gz | |
Fixed dependency checking in some Galera tests
5 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2567c41278f..7974a539ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ make_dist.cmake mariadb-*.*.*.tar.gz mariadb-*.*.*/ mysql-test/lib/My/SafeProcess/my_safe_process +mysql-test/lib/My/SafeProcess/wsrep_check_version mysql-test/mtr mysql-test/mysql-test-run mysql-test/var diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test index 20f2fb9dea0..c8e053dc2b6 100644 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test +++ b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test @@ -5,6 +5,7 @@ --source include/big_test.inc --source include/galera_cluster.inc +--source include/have_innodb.inc --source include/have_mariabackup.inc --connection node_1 diff --git a/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test b/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test index 328b6b7d4de..fd362a26840 100644 --- a/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test +++ b/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test @@ -6,7 +6,8 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_xtrabackup.inc +--source include/have_innodb.inc +--source include/have_mariabackup.inc --source suite/galera/include/galera_st_kill_slave.inc --source suite/galera/include/galera_st_kill_slave_ddl.inc diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test index 8cbd8cf2454..808dad0dbb2 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test @@ -1,5 +1,6 @@ --source include/galera_cluster.inc --source include/check_ipv6.inc +--source include/have_innodb.inc --source include/have_mariabackup.inc # Confirm that initial handshake happened over ipv6 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test index 88c399ddb99..72f4fde299b 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test @@ -1,5 +1,6 @@ --source include/galera_cluster.inc --source include/check_ipv6.inc +--source include/have_innodb.inc --source include/have_mariabackup.inc # Confirm that initial handshake happened over ipv6 |