From ac76b071b34196660e3af2c1460684588e037325 Mon Sep 17 00:00:00 2001 From: zhaoxingyu Date: Wed, 16 Mar 2016 15:58:30 +0800 Subject: [PATCH] evalutator: change the shadowed err Change the shadowed err to err1. --- evaluator/builtin_time.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evaluator/builtin_time.go b/evaluator/builtin_time.go index c421df0d96..084ae13370 100644 --- a/evaluator/builtin_time.go +++ b/evaluator/builtin_time.go @@ -473,7 +473,7 @@ func builtinDateArith(args []types.Datum, ctx context.Context) (d types.Datum, e } case types.KindInt64: x := nodeDate.GetInt64() - if t, err := mysql.ParseTimeFromInt64(x); err == nil { + if t, err1 := mysql.ParseTimeFromInt64(x); err1 == nil { if (t.Type == mysql.TypeDatetime) || (t.Type == mysql.TypeTimestamp) { fieldType = mysql.TypeDatetime }