cherry pick pingcap#31731 to release-5.0

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Jan 17, 2022 · 71731e5 · 71731e5
1 parent 6416f8d
commit 71731e5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/executor/index_lookup_hash_join.go b/executor/index_lookup_hash_join.go
@@ -481,7 +481,9 @@ func (iw *indexHashJoinInnerWorker) run(ctx context.Context, cancelFunc context.
 			break
 		}
 		err := iw.handleTask(ctx, task, joinResult, h, resultCh)
-		if err != nil {
+		if err != nil && !task.keepOuterOrder {
+			// Only need check non-keep-outer-order case because the
+			// `joinResult` had been sent to the `resultCh` when err != nil.
 			joinResult.err = err
 			break
 		}