diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 45b21cde90b35..6a337f98a604a 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -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 { @@ -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 diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go index 58ba76f850aa9..2b82fc110e7f5 100644 --- a/sessionctx/variable/tidb_vars.go +++ b/sessionctx/variable/tidb_vars.go @@ -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"