diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
| commit | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch) | |
| tree | f619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /mysql-test/include | |
| parent | 04efe13501246e490932d4be7bca90e207e0b5e2 (diff) | |
| parent | 1dc2f35598193fc52b79061c286b61f01c617374 (diff) | |
| download | mariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_file_key_management.inc | 6 | ||||
| -rw-r--r-- | mysql-test/include/master-slave.inc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/include/have_file_key_management.inc b/mysql-test/include/have_file_key_management.inc index 06fbb510d6b..68ef49a42d9 100644 --- a/mysql-test/include/have_file_key_management.inc +++ b/mysql-test/include/have_file_key_management.inc @@ -2,3 +2,9 @@ if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'file { --skip Test requires file_key_management plugin } + +# +# This file is only included when using encryption. As all encryption test are +# very slow with valgrind, lets disable these if not run with --big +# +--source include/no_valgrind_without_big.inc diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 5b603fbfdb3..9ed206b2c22 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,5 +1,3 @@ ---source include/no_valgrind_without_big.inc - # ==== Purpose ==== # # Configure two servers to be replication master and slave. |