adapt bug fix pingcap#10244

lzmhhh123 · Jul 2, 2019 · 1aaf860 · 1aaf860
1 parent 6c3888b
commit 1aaf860
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/executor/index_lookup_merge_join.go b/executor/index_lookup_merge_join.go
@@ -628,6 +628,10 @@ func (imw *innerMergeWorker) constructDatumLookupKey(task *lookUpMergeJoinTask,
 		innerColType := imw.rowTypes[imw.keyCols[i]]
 		innerValue, err := outerValue.ConvertTo(sc, innerColType)
 		if err != nil {
+			// If the converted outerValue overflows, we don't need to lookup it.
+			if terror.ErrorEqual(err, types.ErrOverflow) {
+				return nil, nil
+			}
 			return nil, err
 		}
 		cmp, err := outerValue.CompareDatum(sc, &innerValue)