From 8230d8c56b1cc85d6f414afc2e4aa9a86fd6151a Mon Sep 17 00:00:00 2001
From: bb7133 <bb7133@gmail.com>
Date: Thu, 4 Nov 2021 23:13:02 +0800
Subject: [PATCH] cherry pick #27486 to release-5.2

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 config/config.go      | 4 ++++
 config/config_test.go | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/config/config.go b/config/config.go
index 4152a8a90b7cd..dd156cbb74b89 100644
--- 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
index 1630a64b28670..2e5b5d1792e5c 100644
--- 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() }))