Merge branch 'master' into test_partition_exp

pingcap · May 11, 2021 · b8df2b8 · b8df2b8
2 parents 0c38594 + e26b847
commit b8df2b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sessionctx/variable/noop.go b/sessionctx/variable/noop.go
@@ -156,7 +156,7 @@ var noopSysVars = []*SysVar{
 	{Scope: ScopeNone, Name: "myisam_mmap_size", Value: "18446744073709551615"},
 	{Scope: ScopeNone, Name: "innodb_buffer_pool_instances", Value: "8"},
 	{Scope: ScopeGlobal | ScopeSession, Name: "max_length_for_sort_data", Value: "1024", IsHintUpdatable: true},
-	{Scope: ScopeNone, Name: "character_set_system", Value: "utf8"},
+	{Scope: ScopeNone, Name: CharacterSetSystem, Value: "utf8"},
 	{Scope: ScopeGlobal, Name: InnodbOptimizeFullTextOnly, Value: "0"},
 	{Scope: ScopeNone, Name: "character_sets_dir", Value: "/usr/local/mysql-5.6.25-osx10.8-x86_64/share/charsets/"},
 	{Scope: ScopeGlobal | ScopeSession, Name: QueryCacheType, Value: Off, Type: TypeEnum, PossibleValues: []string{Off, On, "DEMAND"}},