cherry pick pingcap#27486 to release-5.2

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Nov 4, 2021 · 8230d8c · 8230d8c
1 parent da1c21f
commit 8230d8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/config/config.go b/config/config.go
@@ -686,6 +686,10 @@ var defaultConf = Config{
 		SpilledFileEncryptionMethod: SpilledFileEncryptionMethodPlaintext,
 		EnableSEM:                   false,
 		AutoTLS:                     false,
+<<<<<<< HEAD
+=======
+		RSAKeySize:                  4096,
+>>>>>>> 0e817e157... config: set the default value of auto_tls to false (#27486)
 	},
 	DeprecateIntegerDisplayWidth: false,
 	EnableEnumLengthLimit:        true,

diff --git a/config/config_test.go b/config/config_test.go
@@ -344,7 +344,11 @@ spilled-file-encryption-method = "aes128-ctr"
 
 	// Make sure the example config is the same as default config except `auto_tls`.
 	conf.Security.AutoTLS = false
+<<<<<<< HEAD
 	c.Assert(conf, DeepEquals, GetGlobalConfig())
+=======
+	require.Equal(t, GetGlobalConfig(), conf)
+>>>>>>> 0e817e157... config: set the default value of auto_tls to false (#27486)
 
 	// Test for log config.
 	c.Assert(conf.Log.ToLogConfig(), DeepEquals, logutil.NewLogConfig("info", "text", "tidb-slow.log", conf.Log.File, false, func(config *zaplog.Config) { config.DisableErrorVerbose = conf.Log.getDisableErrorStack() }))