diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-04-21 18:07:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-04-27 09:22:36 +0200 |
| commit | c2db9397c792a774748f22ddb33b994aae547770 (patch) | |
| tree | 11f79b758399bcdca6cd8081d53d555be37b8d50 /mysql-test/include | |
| parent | 81511b477676da29bcee7ca7f497b73af8a8f1d5 (diff) | |
| download | mariadb-git-c2db9397c792a774748f22ddb33b994aae547770.tar.gz | |
MDEV-18565 Galera mtr-suite fails if galera library is not installed
revert/simplify f5390eea9a9
remove galera-specific checks from mtr and the main suite
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/galera_have_debug_sync.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/galera_resume.inc | 9 | ||||
| -rw-r--r-- | mysql-test/include/have_garbd.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/have_mariabackup.inc | 4 |
4 files changed, 1 insertions, 18 deletions
diff --git a/mysql-test/include/galera_have_debug_sync.inc b/mysql-test/include/galera_have_debug_sync.inc index 7c0156052d8..21e7b3c88c3 100644 --- a/mysql-test/include/galera_have_debug_sync.inc +++ b/mysql-test/include/galera_have_debug_sync.inc @@ -3,7 +3,7 @@ --let $galera_have_debug_sync = `SELECT 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters'` --if (!$galera_have_debug_sync) { - --skip "Test requires Galera debug library with debug_sync functionality" + --skip Test requires Galera debug library with debug_sync functionality } --enable_query_log diff --git a/mysql-test/include/galera_resume.inc b/mysql-test/include/galera_resume.inc deleted file mode 100644 index af8f2b956fd..00000000000 --- a/mysql-test/include/galera_resume.inc +++ /dev/null @@ -1,9 +0,0 @@ ---echo Resuming node ... ---perl - my $pid_filename = $ENV{'_SUSPEND_NODE_PIDFILE'}; - my $mysqld_pid = `cat $pid_filename`; - chomp($mysqld_pid); - system("kill -SIGCONT $mysqld_pid"); - exit(0); -EOF - diff --git a/mysql-test/include/have_garbd.inc b/mysql-test/include/have_garbd.inc deleted file mode 100644 index 0dd693f2c63..00000000000 --- a/mysql-test/include/have_garbd.inc +++ /dev/null @@ -1,4 +0,0 @@ -# -# suite.pm will make sure that all tests including this file -# will be skipped as needed -# diff --git a/mysql-test/include/have_mariabackup.inc b/mysql-test/include/have_mariabackup.inc deleted file mode 100644 index 0dd693f2c63..00000000000 --- a/mysql-test/include/have_mariabackup.inc +++ /dev/null @@ -1,4 +0,0 @@ -# -# suite.pm will make sure that all tests including this file -# will be skipped as needed -# |