executor, sessionctx: fix set tidb_general_log=0 error (pingcap#7186)

dsh0416 · Jul 30, 2018 · 2fee494 · 2fee494
1 parent e907bfc
commit 2fee494
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/executor/set_test.go b/executor/set_test.go
@@ -223,6 +223,9 @@ func (s *testSuite) TestSetVar(c *C) {
 	tk.MustQuery(`select @@session.sql_log_bin;`).Check(testkit.Rows("0"))
 	tk.MustExec("set @@sql_log_bin = on")
 	tk.MustQuery(`select @@session.sql_log_bin;`).Check(testkit.Rows("1"))
+
+	tk.MustExec("set @@tidb_general_log = 1")
+	tk.MustExec("set @@tidb_general_log = 0")
 }
 
 func (s *testSuite) TestSetCharset(c *C) {

diff --git a/sessionctx/variable/varsutil.go b/sessionctx/variable/varsutil.go
@@ -307,7 +307,7 @@ func ValidateSetSystemVar(vars *SessionVars, name string, value string) (string,
 		return value, nil
 	case WarningCount, ErrorCount:
 		return value, ErrReadOnly.GenByArgs(name)
-	case GeneralLog, AvoidTemporalUpgrade, BigTables, CheckProxyUsers, CoreFile, EndMakersInJSON, SQLLogBin, OfflineMode,
+	case GeneralLog, TiDBGeneralLog, AvoidTemporalUpgrade, BigTables, CheckProxyUsers, CoreFile, EndMakersInJSON, SQLLogBin, OfflineMode,
 		PseudoSlaveMode, LowPriorityUpdates, SkipNameResolve, ForeignKeyChecks, SQLSafeUpdates:
 		if strings.EqualFold(value, "ON") || value == "1" {
 			return "1", nil
@@ -331,8 +331,7 @@ func ValidateSetSystemVar(vars *SessionVars, name string, value string) (string,
 		TiDBDistSQLScanConcurrency,
 		TiDBIndexSerialScanConcurrency, TiDBDDLReorgWorkerCount,
 		TiDBBackoffLockFast, TiDBMaxChunkSize,
-		TiDBDMLBatchSize, TiDBOptimizerSelectivityLevel,
-		TiDBGeneralLog:
+		TiDBDMLBatchSize, TiDBOptimizerSelectivityLevel:
 		v, err := strconv.Atoi(value)
 		if err != nil {
 			return value, ErrWrongTypeForVar.GenByArgs(name)