diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 11:52:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 11:52:35 +0300 |
| commit | 06079a4c2cd7574992cafbffd6bd9e95e5809879 (patch) | |
| tree | 6d1293f4917c4ce6190506ded407c8564556481d /mysql-test/suite/encryption | |
| parent | a2a0ac7c4ca6b7ab994b30325045d2406db8ee16 (diff) | |
| parent | 89723ce17959d61a993136e51104fc9b830ac67c (diff) | |
| download | mariadb-git-06079a4c2cd7574992cafbffd6bd9e95e5809879.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb_import.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/t/innodb_import.test b/mysql-test/suite/encryption/t/innodb_import.test index 791a1757878..2e5470c5568 100644 --- a/mysql-test/suite/encryption/t/innodb_import.test +++ b/mysql-test/suite/encryption/t/innodb_import.test @@ -1,5 +1,6 @@ --source include/have_innodb.inc --- source include/have_example_key_management_plugin.inc +--source include/have_example_key_management_plugin.inc +--source include/innodb_checksum_algorithm.inc --echo # --echo # MDEV-26131 SEGV in ha_innobase::discard_or_import_tablespace --echo # |