Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-…

…1e9b519ff7e0
pingcap · Sep 1, 2020 · 1e1c9b6 · 1e1c9b6
2 parents 1b6d078 + fe1298b
commit 1e1c9b6
Show file tree

Hide file tree

Showing 30 changed files with 601 additions and 193 deletions.
diff --git a/errno/errcode.go b/errno/errcode.go
@@ -884,6 +884,7 @@ const (
 	ErrErrorLast                                                    = 1863
 	ErrMaxExecTimeExceeded                                          = 1907
 	ErrInvalidFieldSize                                             = 3013
+	ErrInvalidArgumentForLogarithm                                  = 3020
 	ErrIncorrectType                                                = 3064
 	ErrInvalidJSONData                                              = 3069
 	ErrGeneratedColumnFunctionIsNotAllowed                          = 3102

diff --git a/errno/errname.go b/errno/errname.go
@@ -889,6 +889,7 @@ var MySQLErrName = map[uint16]string{
 	ErrGeneratedColumnRefAutoInc:                             "Generated column '%s' cannot refer to auto-increment column.",
 	ErrWarnConflictingHint:                                   "Hint %s is ignored as conflicting/duplicated.",
 	ErrInvalidFieldSize:                                      "Invalid size for column '%s'.",
+	ErrInvalidArgumentForLogarithm:                           "Invalid argument for logarithm",
 	ErrIncorrectType:                                         "Incorrect type for argument %s in function %s.",
 	ErrInvalidJSONData:                                       "Invalid JSON data provided to function %s: %s",
 	ErrInvalidJSONText:                                       "Invalid JSON text: %-.192s",

diff --git a/executor/index_lookup_join.go b/executor/index_lookup_join.go
@@ -681,6 +681,7 @@ func (e *IndexLookUpJoin) Close() error {
 	}
 	e.workerWg.Wait()
 	e.memTracker = nil
+	e.task = nil
 	if e.runtimeStats != nil {
 		concurrency := cap(e.resultCh)
 		runtimeStats := &execdetails.RuntimeStatsWithConcurrencyInfo{BasicRuntimeStats: e.runtimeStats}