address comments

pingcap · Aug 4, 2021 · 5756178 · 5756178
1 parent 0ee830b
commit 5756178
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/bindinfo/bind_test.go b/bindinfo/bind_test.go
@@ -2130,7 +2130,9 @@ func (s *testSuite) TestForbidEvolvePlanBaseLinesBeforeGA(c *C) {
 	s.cleanBindingEnv(tk)
 	err := tk.ExecToErr("set @@tidb_evolve_plan_baselines=0")
 	c.Assert(err, Equals, nil)
-	err = tk.ExecToErr("set @@tidb_evolve_plan_baselines=1")
+	err = tk.ExecToErr("set @@TiDB_Evolve_pLan_baselines=1")
+	c.Assert(err, ErrorMatches, "Cannot enable baseline evolution feature, it is not generally available now")
+	err = tk.ExecToErr("set @@TiDB_Evolve_pLan_baselines=oN")
 	c.Assert(err, ErrorMatches, "Cannot enable baseline evolution feature, it is not generally available now")
 	err = tk.ExecToErr("admin evolve bindings")
 	c.Assert(err, ErrorMatches, "Cannot enable baseline evolution feature, it is not generally available now")

diff --git a/session/session.go b/session/session.go
@@ -1143,7 +1143,7 @@ func (s *session) SetGlobalSysVar(name, value string) (err error) {
 	if value, err = sv.Validate(s.sessionVars, value, variable.ScopeGlobal); err != nil {
 		return err
 	}
-	if sv.Name == "tidb_evolve_plan_baselines" && strings.EqualFold("ON", value) && !config.CheckTableBeforeDrop {
+	if sv.Name == variable.TiDBEvolvePlanBaselines && value == "ON" && !config.CheckTableBeforeDrop {
 		return errors.Errorf("Cannot enable baseline evolution feature, it is not generally available now")
 	}
 	if err = sv.SetGlobalFromHook(s.sessionVars, value, false); err != nil {

diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -177,7 +177,7 @@ func (sv *SysVar) SetSessionFromHook(s *SessionVars, val string) error {
 		}
 	}
 	// The 'baseline evolution' only work in the test environment before the feature is GA.
-	if sv.Name == "tidb_evolve_plan_baselines" && strings.EqualFold("ON", val) && !config.CheckTableBeforeDrop {
+	if sv.Name == TiDBEvolvePlanBaselines && val == "ON" && !config.CheckTableBeforeDrop {
 		return errors.Errorf("Cannot enable baseline evolution feature, it is not generally available now")
 	}
 	s.systems[sv.Name] = val