Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

variable: small cleanups #25266

Merged
merged 8 commits into from
Jun 11, 2021
Merged

variable: small cleanups #25266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6bf282a
variable: small cleanups
morgo Jun 8, 2021
ea3db35
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 9, 2021
63cdae3
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 9, 2021
c46c256
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 9, 2021
7ee7b51
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 9, 2021
fdbdccd
Merge branch 'master' into cleanup-sysvars
morgo Jun 10, 2021
bb6b120
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 11, 2021
0807645
Merge branch 'master' into cleanup-sysvars
ti-chi-bot Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions sessionctx/variable/sysvar.go
View file
Open in desktop
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
View file
Open in desktop
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