database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1003 from pingcap/shenli/fix-shadow

Browse Source 
*: Fix go vet shadow
This commit is contained in:
zimulala
2016-03-23 10:41:34 +08:00
parent ad5657f9a3 5fd28ea1b2
commit 14bc9a0ddb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
evaluator/builtin_time.go
View File

@ -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)
}