database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-9010 Encryption preset file contains different configuration preset then documentation

Browse Source 
* clarify the comment in the preset file
* make boolean --aria-encrypt-tables option to work without an argument
This commit is contained in:
Sergei Golubchik
2015-10-29 09:58:11 +01:00
parent 239e0c571e
commit 937aa7ad77
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/encryption/t/innodb_encryption.opt
View File

@ -1,7 +1,7 @@
--aria-encrypt-tables=ON --aria-encrypt-tables
--encrypt-tmp-disk-tables=ON --encrypt-tmp-disk-tables
--innodb-encrypt-tables=ON --innodb-encrypt-tables
--innodb-encrypt-log=ON --innodb-encrypt-log
--innodb-encryption-rotate-key-age=15 --innodb-encryption-rotate-key-age=15
--innodb-encryption-threads=4 --innodb-encryption-threads=4
--innodb-tablespaces-encryption --innodb-tablespaces-encryption

2
mysql-test/suite/sys_vars/r/sysvars_aria.result
View File

@ -56,7 +56,7 @@ NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE 0 GLOBAL_VALUE 0

2
storage/maria/ha_maria.cc
View File

@ -290,7 +290,7 @@ static MYSQL_SYSVAR_BOOL(used_for_temp_tables,
"Whether temporary tables should be MyISAM or Aria", 0, 0, "Whether temporary tables should be MyISAM or Aria", 0, 0,
1); 1);
static MYSQL_SYSVAR_BOOL(encrypt_tables, maria_encrypt_tables, 0, static MYSQL_SYSVAR_BOOL(encrypt_tables, maria_encrypt_tables, PLUGIN_VAR_OPCMDARG,
"Encrypt tables (only for tables with ROW_FORMAT=PAGE (default) " "Encrypt tables (only for tables with ROW_FORMAT=PAGE (default) "
"and not FIXED/DYNAMIC)", "and not FIXED/DYNAMIC)",
0, 0, 0); 0, 0, 0);

8
support-files/rpm/enable_encryption.preset
View File

@ -4,8 +4,12 @@
# ensure that everything that can be encrypted will be and your # ensure that everything that can be encrypted will be and your
# data will not leak unencrypted. # data will not leak unencrypted.
# #
# If in the future more encryption related options will be implemented, # DO NOT EDIT THIS FILE! On MariaDB upgrades it might be replaced with a
# this file will enable them too. # newer version and your edits will be lost. Instead, add your edits
# to the .cnf file after the !include directive.
#
# NOTE that you also need to install an encryption plugin for the encryption
# to work. See https://mariadb.com/kb/en/mariadb/data-at-rest-encryption/#encryption-key-management
# #
[mariadb] [mariadb]
aria-encrypt-tables aria-encrypt-tables