Skip to content

Commit edb37ae

Browse files
committed
disable encrypt_tmp_files and encrypt_binlog by default
1 parent 2c1553e commit edb37ae

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

mysql-test/r/mysqld--help.result

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,11 @@ The following options may be given as the first argument:
178178
Precision of the result of '/' operator will be increased
179179
on that value
180180
--encrypt-binlog Encrypt binary logs (including relay logs)
181-
(Defaults to on; use --skip-encrypt-binlog to disable.)
182181
--encrypt-tmp-disk-tables
183182
Encrypt temporary on-disk tables (created as part of
184183
query execution)
185184
--encrypt-tmp-files Encrypt temporary files (created for filesort, binary log
186185
cache, etc)
187-
(Defaults to on; use --skip-encrypt-tmp-files to disable.)
188186
--enforce-storage-engine=name
189187
Force the use of a storage engine for new tables
190188
--event-scheduler[=name]
@@ -1174,9 +1172,9 @@ delayed-insert-limit 100
11741172
delayed-insert-timeout 300
11751173
delayed-queue-size 1000
11761174
div-precision-increment 4
1177-
encrypt-binlog TRUE
1175+
encrypt-binlog FALSE
11781176
encrypt-tmp-disk-tables FALSE
1179-
encrypt-tmp-files TRUE
1177+
encrypt-tmp-files FALSE
11801178
enforce-storage-engine (No default value)
11811179
event-scheduler OFF
11821180
expensive-subquery-limit 100

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,9 @@ READ_ONLY NO
711711
COMMAND_LINE_ARGUMENT REQUIRED
712712
VARIABLE_NAME ENCRYPT_BINLOG
713713
SESSION_VALUE NULL
714-
GLOBAL_VALUE ON
714+
GLOBAL_VALUE OFF
715715
GLOBAL_VALUE_ORIGIN COMPILE-TIME
716-
DEFAULT_VALUE ON
716+
DEFAULT_VALUE OFF
717717
VARIABLE_SCOPE GLOBAL
718718
VARIABLE_TYPE BOOLEAN
719719
VARIABLE_COMMENT Encrypt binary logs (including relay logs)
@@ -739,9 +739,9 @@ READ_ONLY NO
739739
COMMAND_LINE_ARGUMENT OPTIONAL
740740
VARIABLE_NAME ENCRYPT_TMP_FILES
741741
SESSION_VALUE NULL
742-
GLOBAL_VALUE ON
742+
GLOBAL_VALUE OFF
743743
GLOBAL_VALUE_ORIGIN COMPILE-TIME
744-
DEFAULT_VALUE ON
744+
DEFAULT_VALUE OFF
745745
VARIABLE_SCOPE GLOBAL
746746
VARIABLE_TYPE BOOLEAN
747747
VARIABLE_COMMENT Encrypt temporary files (created for filesort, binary log cache, etc)

sql/sys_vars.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5213,12 +5213,12 @@ static Sys_var_mybool Sys_encrypt_tmp_files(
52135213
"encrypt_tmp_files",
52145214
"Encrypt temporary files (created for filesort, binary log cache, etc)",
52155215
READ_ONLY GLOBAL_VAR(encrypt_tmp_files),
5216-
CMD_LINE(OPT_ARG), DEFAULT(TRUE));
5216+
CMD_LINE(OPT_ARG), DEFAULT(FALSE));
52175217

52185218
static Sys_var_mybool Sys_binlog_encryption(
52195219
"encrypt_binlog", "Encrypt binary logs (including relay logs)",
52205220
READ_ONLY GLOBAL_VAR(encrypt_binlog), CMD_LINE(OPT_ARG),
5221-
DEFAULT(TRUE));
5221+
DEFAULT(FALSE));
52225222

52235223
static const char *binlog_row_image_names[]= {"MINIMAL", "NOBLOB", "FULL", NullS};
52245224
static Sys_var_enum Sys_binlog_row_image(

0 commit comments

Comments
 (0)