diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-12-20 15:44:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-12-20 15:44:23 +0200 |
| commit | 406b31e628145f6af0fa567c0e42b8391e5173bb (patch) | |
| tree | aff311e03c5bb078fe67b090bd8a0e602beed547 /mysql-test | |
| parent | 634428b37fd039b862c8277a0c7b0b5f56e765fc (diff) | |
| download | mariadb-git-bb-10.1-eperi.tar.gz | |
Fixes for encryption from eperibb-10.1-eperi
Diffstat (limited to 'mysql-test')
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption-32k-master.opt b/mysql-test/suite/innodb/t/innodb-page_encryption-32k-master.opt index 0c479718e27..a2d8b7ab11a 100644 --- a/mysql-test/suite/innodb/t/innodb-page_encryption-32k-master.opt +++ b/mysql-test/suite/innodb/t/innodb-page_encryption-32k-master.opt @@ -1 +1 @@ ---default_storage_engine=InnoDB --innodb-buffer-pool-size=24M --innodb_data_encryption_providertype=1 --innodb_data_encryption_providername=keys.txt --innodb_data_encryption_providerurl=$MYSQL_TEST_DIR/suite/innodb/include +--default_storage_engine=InnoDB --innodb-buffer-pool-size=24M --file_key_management_plugin_filename=$MYSQL_TEST_DIR/suite/innodb/include/keys.txt
\ No newline at end of file diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption.opt b/mysql-test/suite/innodb/t/innodb-page_encryption.opt index 8f9ce8c88ed..ca1d5d1ef18 100644 --- a/mysql-test/suite/innodb/t/innodb-page_encryption.opt +++ b/mysql-test/suite/innodb/t/innodb-page_encryption.opt @@ -1 +1 @@ ---innodb_data_encryption_providertype=1 --innodb_data_encryption_providername=keys.txt --innodb_data_encryption_providerurl=$MYSQL_TEST_DIR/suite/innodb/include
\ No newline at end of file +--enable-file_key_management_plugin --file_key_management_plugin_filename=$MYSQL_TEST_DIR/suite/innodb/include/keys.txt diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.opt b/mysql-test/suite/innodb/t/innodb-page_encryption_compression.opt index 8f9ce8c88ed..da28287f7a4 100644 --- a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.opt +++ b/mysql-test/suite/innodb/t/innodb-page_encryption_compression.opt @@ -1 +1 @@ ---innodb_data_encryption_providertype=1 --innodb_data_encryption_providername=keys.txt --innodb_data_encryption_providerurl=$MYSQL_TEST_DIR/suite/innodb/include
\ No newline at end of file +--enable-file_key_management_plugin --file_key_management_plugin_filename=$MYSQL_TEST_DIR/suite/innodb/include/keys.txt
\ No newline at end of file |