Merge branch 'release-5.3' into release-5.3-d83ee8cfdad4

expression/scalar_function.go

@@ -288,6 +288,7 @@ func (sf *ScalarFunction) Clone() Expression {
 	}
 	c.SetCharsetAndCollation(sf.CharsetAndCollation(sf.GetCtx()))
 	c.SetCoercibility(sf.Coercibility())
+	c.SetRepertoire(sf.Repertoire())
 	return c
 }
 

expression/scalar_function_test.go

@@ -50,6 +50,8 @@ func TestScalarFunction(t *testing.T) {
 	require.True(t, ok)
 	require.Equal(t, "values", newSf.FuncName.O)
 	require.Equal(t, mysql.TypeLonglong, newSf.RetType.Tp)
+	require.Equal(t, sf.Coercibility(), newSf.Coercibility())
+	require.Equal(t, sf.Repertoire(), newSf.Repertoire())
 	_, ok = newSf.Function.(*builtinValuesIntSig)
 	require.True(t, ok)
 }

util/logutil/slow_query_logger.go

@@ -29,17 +29,15 @@ var _pool = buffer.NewPool()
 
 func newSlowQueryLogger(cfg *LogConfig) (*zap.Logger, *log.ZapProperties, error) {
 
-	// copy global config and override slow query log file
-	// if slow query log filename is empty, slow query log will behave the same as global log
+	// copy the global log config to slow log config
+	// if the filename of slow log config is empty, slow log will behave the same as global log.
 	sqConfig := cfg.Config
 	// level of the global log config doesn't affect the slow query logger which determines whether to
 	// log by execution duration.
 	sqConfig.Level = LogConfig{}.Level
 	if len(cfg.SlowQueryFile) != 0 {
-		sqConfig.File = log.FileLogConfig{
-			MaxSize:  cfg.File.MaxSize,
-			Filename: cfg.SlowQueryFile,
-		}
+		sqConfig.File = cfg.File
+		sqConfig.File.Filename = cfg.SlowQueryFile
 	}
 
 	// create the slow query logger