disable encrypt_tmp_files and encrypt_binlog by default

MariaDB · Sep 8, 2015 · edb37ae · edb37ae
1 parent 2c1553e
commit edb37ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
@@ -178,13 +178,11 @@ The following options may be given as the first argument:
  Precision of the result of '/' operator will be increased
  on that value
  --encrypt-binlog    Encrypt binary logs (including relay logs)
- (Defaults to on; use --skip-encrypt-binlog to disable.)
  --encrypt-tmp-disk-tables 
  Encrypt temporary on-disk tables (created as part of
  query execution)
  --encrypt-tmp-files Encrypt temporary files (created for filesort, binary log
  cache, etc)
- (Defaults to on; use --skip-encrypt-tmp-files to disable.)
  --enforce-storage-engine=name 
  Force the use of a storage engine for new tables
  --event-scheduler[=name] 
@@ -1174,9 +1172,9 @@ delayed-insert-limit 100
 delayed-insert-timeout 300
 delayed-queue-size 1000
 div-precision-increment 4
-encrypt-binlog TRUE
+encrypt-binlog FALSE
 encrypt-tmp-disk-tables FALSE
-encrypt-tmp-files TRUE
+encrypt-tmp-files FALSE
 enforce-storage-engine (No default value)
 event-scheduler OFF
 expensive-subquery-limit 100

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -711,9 +711,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ENCRYPT_BINLOG
 SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
+GLOBAL_VALUE	OFF
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
+DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Encrypt binary logs (including relay logs)
@@ -739,9 +739,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	ENCRYPT_TMP_FILES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
+GLOBAL_VALUE	OFF
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
+DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Encrypt temporary files (created for filesort, binary log cache, etc)

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -5213,12 +5213,12 @@ static Sys_var_mybool Sys_encrypt_tmp_files(
        "encrypt_tmp_files",
        "Encrypt temporary files (created for filesort, binary log cache, etc)",
        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(
        "encrypt_binlog", "Encrypt binary logs (including relay logs)",
        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 Sys_var_enum Sys_binlog_row_image(