From 3fd96c77da2a2a098f20fefff0f19da24f01acb4 Mon Sep 17 00:00:00 2001 From: Yuanjia Zhang Date: Mon, 21 Aug 2023 20:36:34 +0800 Subject: [PATCH] This is an automated cherry-pick of #46271 Signed-off-by: ti-chi-bot --- pkg/executor/index_lookup_join_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/executor/index_lookup_join_test.go b/pkg/executor/index_lookup_join_test.go index 6e0d8e939535e..7cbe41467bbc1 100644 --- a/pkg/executor/index_lookup_join_test.go +++ b/pkg/executor/index_lookup_join_test.go @@ -192,7 +192,11 @@ func TestInapplicableIndexJoinHint(t *testing.T) { query := `select /*+ tidb_inlj(bb) */ aa.* from (select * from t1) as aa left join (select t2.a, t2.a*2 as a2 from t2) as bb on aa.a=bb.a;` +<<<<<<< HEAD:pkg/executor/index_lookup_join_test.go tk.MustHavePlan(query, "IndexJoin") +======= + tk.HasPlan(query, "IndexJoin") +>>>>>>> 0c3bbc127c8 (planner: fix the issue that TIDB_INLJ hint cannot take effect when left joining two sub-queries (#46271)):executor/index_lookup_join_test.go } func TestIndexJoinOverflow(t *testing.T) {