diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-31 19:32:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-09 18:42:43 +0200 |
| commit | bb1b61b312088ba9f5f2cb606594b6f33c284402 (patch) | |
| tree | c5b433d19434e194fb82d2407adbbfee759dfd31 /mysql-test/r/mysqld--help.result | |
| parent | 9ccafffc29526ea30151eb3e62901bfdb77aaf84 (diff) | |
| download | mariadb-git-bb1b61b312088ba9f5f2cb606594b6f33c284402.tar.gz | |
encryption plugin controls the encryption
* no --encryption-algorithm option anymore
* encrypt/decrypt methods in the encryption plugin
* ecnrypt/decrypt methods in the encryption_km service
* file_km plugin has --file-key-management-encryption-algorithm
* debug_km always uses aes_cbc
* example_km changes between aes_cbc and aes_ecb for different key versions
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 7d59ecd1dc2..3bd5e296ec9 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -165,10 +165,6 @@ The following options may be given as the first argument: --encrypt-tmp-disk-tables Encrypt tmp disk tables (created as part of query execution) - --encryption-algorithm=name - Which encryption algorithm to use for table encryption. - aes_cbc is the recommended one.. One of: none, aes_ecb, - aes_cbc, aes_ctr --enforce-storage-engine=name Force the use of a storage engine for new tables --event-scheduler[=name] @@ -1151,7 +1147,6 @@ delayed-insert-timeout 300 delayed-queue-size 1000 div-precision-increment 4 encrypt-tmp-disk-tables FALSE -encryption-algorithm none enforce-storage-engine (No default value) event-scheduler OFF expensive-subquery-limit 100 |