diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
| commit | f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf (patch) | |
| tree | 88134dff388f88041cd557eb53bc262667f51f96 /mysql-test/suite/encryption/t/innodb-remove-encryption.test | |
| parent | bf5c050fd28f616d789a02b0fbd6fd8ff53c78d3 (diff) | |
| parent | b8d38c5e39d526e006f4e8e8977ac4c6166bc4c6 (diff) | |
| download | mariadb-git-f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/encryption/t/innodb-remove-encryption.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-remove-encryption.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-remove-encryption.test b/mysql-test/suite/encryption/t/innodb-remove-encryption.test index aeafd99325b..1982616aec2 100644 --- a/mysql-test/suite/encryption/t/innodb-remove-encryption.test +++ b/mysql-test/suite/encryption/t/innodb-remove-encryption.test @@ -18,7 +18,7 @@ create table t1(a int not null primary key, b char(200)) engine=innodb; --echo --echo # Restart server with encryption --- let $restart_parameters=--plugin-load-add=$FILE_KEY_MANAGEMENT_SO --loose-file-key-management --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt --file-key-management-encryption-algorithm=aes_cbc --innodb-encrypt-tables=ON --innodb-encryption-threads=4 --innodb-tablespaces-encryption --innodb-encryption-rotate-key-age=15 +-- let $restart_parameters=--plugin-load-add=file_key_management --loose-file-key-management --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt --file-key-management-encryption-algorithm=aes_cbc --innodb-encrypt-tables=ON --innodb-encryption-threads=4 --innodb-tablespaces-encryption --innodb-encryption-rotate-key-age=15 -- source include/restart_mysqld.inc --echo # Wait until encryption threads have encrypted all tablespaces |