Skip to content

Commit

Permalink
variable: small cleanups (#25266)
Browse files Browse the repository at this point in the history
  • Loading branch information
morgo authored Jun 11, 2021
1 parent 07d1606 commit a45b3aa
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions sessionctx/variable/sysvar.go
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ var defaultSysVars = []*SysVar{
}
return normalizedValue, nil
}},
{Scope: ScopeNone, Name: Socket, Value: "/tmp/myssock"},
{Scope: ScopeNone, Name: Socket, Value: ""},
{Scope: ScopeGlobal | ScopeSession, Name: CharacterSetConnection, Value: mysql.DefaultCharset, skipInit: true, Validation: func(vars *SessionVars, normalizedValue string, originalValue string, scope ScopeFlag) (string, error) {
return checkCharacterSet(normalizedValue, CharacterSetConnection)
}, SetSession: func(s *SessionVars, val string) error {
Expand Down Expand Up @@ -1274,7 +1274,6 @@ var defaultSysVars = []*SysVar{
return nil
}},
/* The following variable is defined as session scope but is actually server scope. */
{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnableDynamicPrivileges, Value: On, Type: TypeBool, Hidden: true},
{Scope: ScopeSession, Name: TiDBGeneralLog, Value: BoolToOnOff(DefTiDBGeneralLog), Type: TypeBool, skipInit: true, SetSession: func(s *SessionVars, val string) error {
ProcessGeneralLog.Store(TiDBOptOn(val))
return nil
Expand Down
3 changes: 0 additions & 3 deletions sessionctx/variable/tidb_vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,6 @@ const (
// Now we only support TiFlash.
TiDBAllowFallbackToTiKV = "tidb_allow_fallback_to_tikv"

// TiDBEnableDynamicPrivileges enables MySQL 8.0 compatible dynamic privileges (experimental).
TiDBEnableDynamicPrivileges = "tidb_enable_dynamic_privileges"

// TiDBEnableTopSQL indicates whether the top SQL is enabled.
TiDBEnableTopSQL = "tidb_enable_top_sql"

Expand Down

0 comments on commit a45b3aa

Please sign in to comment.