Commit edb37ae3 authored by Sergei Golubchik's avatar Sergei Golubchik

disable encrypt_tmp_files and encrypt_binlog by default

parent 2c1553e5
...@@ -178,13 +178,11 @@ The following options may be given as the first argument: ...@@ -178,13 +178,11 @@ The following options may be given as the first argument:
Precision of the result of '/' operator will be increased Precision of the result of '/' operator will be increased
on that value on that value
--encrypt-binlog Encrypt binary logs (including relay logs) --encrypt-binlog Encrypt binary logs (including relay logs)
(Defaults to on; use --skip-encrypt-binlog to disable.)
--encrypt-tmp-disk-tables --encrypt-tmp-disk-tables
Encrypt temporary on-disk tables (created as part of Encrypt temporary on-disk tables (created as part of
query execution) query execution)
--encrypt-tmp-files Encrypt temporary files (created for filesort, binary log --encrypt-tmp-files Encrypt temporary files (created for filesort, binary log
cache, etc) cache, etc)
(Defaults to on; use --skip-encrypt-tmp-files to disable.)
--enforce-storage-engine=name --enforce-storage-engine=name
Force the use of a storage engine for new tables Force the use of a storage engine for new tables
--event-scheduler[=name] --event-scheduler[=name]
...@@ -1174,9 +1172,9 @@ delayed-insert-limit 100 ...@@ -1174,9 +1172,9 @@ delayed-insert-limit 100
delayed-insert-timeout 300 delayed-insert-timeout 300
delayed-queue-size 1000 delayed-queue-size 1000
div-precision-increment 4 div-precision-increment 4
encrypt-binlog TRUE encrypt-binlog FALSE
encrypt-tmp-disk-tables FALSE encrypt-tmp-disk-tables FALSE
encrypt-tmp-files TRUE encrypt-tmp-files FALSE
enforce-storage-engine (No default value) enforce-storage-engine (No default value)
event-scheduler OFF event-scheduler OFF
expensive-subquery-limit 100 expensive-subquery-limit 100
......
...@@ -711,9 +711,9 @@ READ_ONLY NO ...@@ -711,9 +711,9 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME ENCRYPT_BINLOG VARIABLE_NAME ENCRYPT_BINLOG
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE ON GLOBAL_VALUE OFF
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE ON DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Encrypt binary logs (including relay logs) VARIABLE_COMMENT Encrypt binary logs (including relay logs)
...@@ -739,9 +739,9 @@ READ_ONLY NO ...@@ -739,9 +739,9 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME ENCRYPT_TMP_FILES VARIABLE_NAME ENCRYPT_TMP_FILES
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE ON GLOBAL_VALUE OFF
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE ON DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Encrypt temporary files (created for filesort, binary log cache, etc) VARIABLE_COMMENT Encrypt temporary files (created for filesort, binary log cache, etc)
......
...@@ -5213,12 +5213,12 @@ static Sys_var_mybool Sys_encrypt_tmp_files( ...@@ -5213,12 +5213,12 @@ static Sys_var_mybool Sys_encrypt_tmp_files(
"encrypt_tmp_files", "encrypt_tmp_files",
"Encrypt temporary files (created for filesort, binary log cache, etc)", "Encrypt temporary files (created for filesort, binary log cache, etc)",
READ_ONLY GLOBAL_VAR(encrypt_tmp_files), READ_ONLY GLOBAL_VAR(encrypt_tmp_files),
CMD_LINE(OPT_ARG), DEFAULT(TRUE)); CMD_LINE(OPT_ARG), DEFAULT(FALSE));
static Sys_var_mybool Sys_binlog_encryption( static Sys_var_mybool Sys_binlog_encryption(
"encrypt_binlog", "Encrypt binary logs (including relay logs)", "encrypt_binlog", "Encrypt binary logs (including relay logs)",
READ_ONLY GLOBAL_VAR(encrypt_binlog), CMD_LINE(OPT_ARG), READ_ONLY GLOBAL_VAR(encrypt_binlog), CMD_LINE(OPT_ARG),
DEFAULT(TRUE)); DEFAULT(FALSE));
static const char *binlog_row_image_names[]= {"MINIMAL", "NOBLOB", "FULL", NullS}; static const char *binlog_row_image_names[]= {"MINIMAL", "NOBLOB", "FULL", NullS};
static Sys_var_enum Sys_binlog_row_image( static Sys_var_enum Sys_binlog_row_image(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment