This is an automated cherry-pick of pingcap#46271

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Feb 1, 2024 · 3fd96c7 · 3fd96c7
1 parent 634602f
commit 3fd96c7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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) {