fixup

planner/core/plan_cache_test.go

@@ -371,34 +371,6 @@ func TestIssue40224(t *testing.T) {
 			{"└─IndexRangeScan_5"}, // range scan not full scan
 		})
 }
-<<<<<<< HEAD
-=======
-
-func TestIssue40225(t *testing.T) {
-	store := testkit.CreateMockStore(t)
-	tk := testkit.NewTestKit(t, store)
-	tk.MustExec("use test")
-	tk.MustExec("create table t (a int, key(a))")
-	tk.MustExec("prepare st from 'select * from t where a<?'")
-	tk.MustExec("set @a='1'")
-	tk.MustExec("execute st using @a")
-	tk.MustQuery("show warnings").Sort().Check(testkit.Rows("Warning 1105 skip plan-cache: '1' may be converted to INT")) // plan-cache limitation
-	tk.MustExec("create binding for select * from t where a<1 using select /*+ ignore_plan_cache() */ * from t where a<1")
-	tk.MustExec("execute st using @a")
-	tk.MustQuery("show warnings").Sort().Check(testkit.Rows("Warning 1105 skip plan-cache: ignore plan cache by binding"))
-	// no warning about plan-cache limitations('1' -> INT) since plan-cache is totally disabled.
-
-	tk.MustExec("prepare st from 'select * from t where a>?'")
-	tk.MustExec("set @a=1")
-	tk.MustExec("execute st using @a")
-	tk.MustExec("execute st using @a")
-	tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("1"))
-	tk.MustExec("create binding for select * from t where a>1 using select /*+ ignore_plan_cache() */ * from t where a>1")
-	tk.MustExec("execute st using @a")
-	tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("0"))
-	tk.MustExec("execute st using @a")
-	tk.MustQuery("select @@last_plan_from_binding").Check(testkit.Rows("1"))
-}
 
 func TestIssue40679(t *testing.T) {
 	store := testkit.CreateMockStore(t)
@@ -438,54 +410,3 @@ func TestIssue41032(t *testing.T) {
 	tk.MustQuery(`execute stmt using @a,@b`).Check(testkit.Rows())
 	tk.MustQuery(`select @@last_plan_from_cache`).Check(testkit.Rows("1"))
 }
-
-func TestPlanCacheWithLimit(t *testing.T) {
-	store := testkit.CreateMockStore(t)
-	tk := testkit.NewTestKit(t, store)
-	tk.MustExec("use test")
-	tk.MustExec("drop table if exists t")
-	tk.MustExec("create table t(a int primary key, b int)")
-
-	testCases := []struct {
-		sql    string
-		params []int
-	}{
-		{"prepare stmt from 'select * from t limit ?'", []int{1}},
-		{"prepare stmt from 'select * from t limit 1, ?'", []int{1}},
-		{"prepare stmt from 'select * from t limit ?, 1'", []int{1}},
-		{"prepare stmt from 'select * from t limit ?, ?'", []int{1, 2}},
-		{"prepare stmt from 'delete from t order by a limit ?'", []int{1}},
-		{"prepare stmt from 'insert into t select * from t order by a desc limit ?'", []int{1}},
-		{"prepare stmt from 'insert into t select * from t order by a desc limit ?, ?'", []int{1, 2}},
-		{"prepare stmt from 'update t set a = 1 limit ?'", []int{1}},
-		{"prepare stmt from '(select * from t order by a limit ?) union (select * from t order by a desc limit ?)'", []int{1, 2}},
-		{"prepare stmt from 'select * from t where a = ? limit ?, ?'", []int{1, 1, 1}},
-		{"prepare stmt from 'select * from t where a in (?, ?) limit ?, ?'", []int{1, 2, 1, 1}},
-	}
-
-	for idx, testCase := range testCases {
-		tk.MustExec(testCase.sql)
-		var using []string
-		for i, p := range testCase.params {
-			tk.MustExec(fmt.Sprintf("set @a%d = %d", i, p))
-			using = append(using, fmt.Sprintf("@a%d", i))
-		}
-
-		tk.MustExec("execute stmt using " + strings.Join(using, ", "))
-		tk.MustExec("execute stmt using " + strings.Join(using, ", "))
-		tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("1"))
-
-		if idx < 9 {
-			// none point get plan
-			tk.MustExec("set @a0 = 6")
-			tk.MustExec("execute stmt using " + strings.Join(using, ", "))
-			tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("0"))
-		}
-	}
-
-	tk.MustExec("prepare stmt from 'select * from t limit ?'")
-	tk.MustExec("set @a = 10001")
-	tk.MustExec("execute stmt using @a")
-	tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1105 skip plan-cache: limit count more than 10000"))
-}
->>>>>>> 567b329fa1f (planner: label plans as over-optimized for plan cache after refining cmp-function arguments (#41136))