fixup

pingcap · Sep 28, 2021 · cd19d9f · cd19d9f
1 parent 49cac2e
commit cd19d9f
Showing 1 changed file with 0 additions and 47 deletions.
diff --git a/executor/prepared_test.go b/executor/prepared_test.go
@@ -404,8 +404,6 @@ func (s *testPrepareSuite) TestPlanCacheWithDifferentVariableTypes(c *C) {
 		}
 	}
 }
-<<<<<<< HEAD
-=======
 
 func (s *testSerialSuite) TestIssue28087And28162(c *C) {
 	store, dom, err := newStoreWithBootstrap()
@@ -449,48 +447,3 @@ func (s *testSerialSuite) TestIssue28087And28162(c *C) {
 	tk.MustQuery(`execute stmt using @a,@b,@c,@d`).Check(testkit.Rows("1970-12-18 10:53:28 1970-12-18 10:53:28 1970-12-18 10:53:28 1970-12-18 10:53:28 1970-12-18 10:53:28 1970-12-18 10:53:28"))
 	tk.MustQuery(`select @@last_plan_from_cache`).Check(testkit.Rows("1"))
 }
-
-func (s *testSerialSuite) TestIssue28064(c *C) {
-	store, dom, err := newStoreWithBootstrap()
-	c.Assert(err, IsNil)
-	tk := testkit.NewTestKit(c, store)
-	defer func() {
-		dom.Close()
-		store.Close()
-	}()
-	orgEnable := plannercore.PreparedPlanCacheEnabled()
-	defer func() {
-		plannercore.SetPreparedPlanCache(orgEnable)
-	}()
-	plannercore.SetPreparedPlanCache(true)
-	tk.MustExec("use test")
-	tk.MustExec("drop table if exists t28064")
-	tk.MustExec("CREATE TABLE `t28064` (" +
-		"`a` decimal(10,0) DEFAULT NULL," +
-		"`b` decimal(10,0) DEFAULT NULL," +
-		"`c` decimal(10,0) DEFAULT NULL," +
-		"`d` decimal(10,0) DEFAULT NULL," +
-		"KEY `iabc` (`a`,`b`,`c`));")
-	tk.MustExec("set @a='123', @b='234', @c='345';")
-	tk.MustExec("prepare stmt1 from 'select * from t28064 use index (iabc) where a = ? and b = ? and c = ?';")
-
-	tk.MustExec("execute stmt1 using @a, @b, @c;")
-	tkProcess := tk.Se.ShowProcess()
-	ps := []*util.ProcessInfo{tkProcess}
-	tk.Se.SetSessionManager(&mockSessionManager1{PS: ps})
-	rows := tk.MustQuery(fmt.Sprintf("explain for connection %d", tkProcess.ID))
-	rows.Check(testkit.Rows("IndexLookUp_7 0.00 root  ",
-		"├─IndexRangeScan_5(Build) 0.00 cop[tikv] table:t28064, index:iabc(a, b, c) range:[123 234 345,123 234 345], keep order:false, stats:pseudo",
-		"└─TableRowIDScan_6(Probe) 0.00 cop[tikv] table:t28064 keep order:false, stats:pseudo"))
-
-	tk.MustExec("execute stmt1 using @a, @b, @c;")
-	rows = tk.MustQuery("select @@last_plan_from_cache")
-	rows.Check(testkit.Rows("1"))
-
-	tk.MustExec("execute stmt1 using @a, @b, @c;")
-	rows = tk.MustQuery(fmt.Sprintf("explain for connection %d", tkProcess.ID))
-	rows.Check(testkit.Rows("IndexLookUp_7 0.00 root  ",
-		"├─IndexRangeScan_5(Build) 0.00 cop[tikv] table:t28064, index:iabc(a, b, c) range:[123 234 345,123 234 345], keep order:false, stats:pseudo",
-		"└─TableRowIDScan_6(Probe) 0.00 cop[tikv] table:t28064 keep order:false, stats:pseudo"))
-}
->>>>>>> 3e2605acd... planner: fix the issue that planner may cache invalid plans for joins in some cases (#28432)