From 5fd28ea1b2549961de9a6c7e3000743e3ec1285e Mon Sep 17 00:00:00 2001 From: shenli Date: Wed, 23 Mar 2016 10:32:29 +0800 Subject: [PATCH] *: Fix go vet shadow --- evaluator/builtin_time.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/evaluator/builtin_time.go b/evaluator/builtin_time.go index 084ae13370..b28778191f 100644 --- a/evaluator/builtin_time.go +++ b/evaluator/builtin_time.go @@ -501,8 +501,8 @@ func builtinDateArith(args []types.Datum, ctx context.Context) (d types.Datum, e // parse interval var interval string if strings.ToLower(nodeInterval.Unit) == "day" { - day, err2 := parseDayInterval(*nodeIntervalIntervalDatum) - if err2 != nil { + day, err1 := parseDayInterval(*nodeIntervalIntervalDatum) + if err1 != nil { d.SetNull() return d, ErrInvalidOperation.Gen("DateArith invalid day interval, need int but got %T", nodeIntervalIntervalDatum.GetString()) } @@ -511,10 +511,10 @@ func builtinDateArith(args []types.Datum, ctx context.Context) (d types.Datum, e if nodeIntervalIntervalDatum.Kind() == types.KindString { interval = fmt.Sprintf("%v", nodeIntervalIntervalDatum.GetString()) } else { - ii, err := nodeIntervalIntervalDatum.ToInt64() - if err != nil { + ii, err1 := nodeIntervalIntervalDatum.ToInt64() + if err1 != nil { d.SetNull() - return d, errors.Trace(err) + return d, errors.Trace(err1) } interval = fmt.Sprintf("%v", ii) }