session: fix bootstrap to only persist global variables (#30593)

close #28667
pingcap · Dec 19, 2021 · 866c551 · 866c551
1 parent 778e188
commit 866c551
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/session/bootstrap.go b/session/bootstrap.go
@@ -1764,8 +1764,8 @@ func doDMLWorks(s Session) {
 	// Init global system variables table.
 	values := make([]string, 0, len(variable.GetSysVars()))
 	for k, v := range variable.GetSysVars() {
-		// Session only variable should not be inserted.
-		if v.Scope != variable.ScopeSession {
+		// Only global variables should be inserted.
+		if v.HasGlobalScope() {
 			vVal := v.Value
 			if v.Name == variable.TiDBTxnMode && config.GetGlobalConfig().Store == "tikv" {
 				vVal = "pessimistic"

diff --git a/session/bootstrap_serial_test.go b/session/bootstrap_serial_test.go
@@ -113,7 +113,7 @@ func TestBootstrap(t *testing.T) {
 func globalVarsCount() int64 {
 	var count int64
 	for _, v := range variable.GetSysVars() {
-		if v.Scope != variable.ScopeSession {
+		if v.HasGlobalScope() {
 			count++
 		}
 	}