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

session: fix show variable result of tidb_enable_window_function after upgrade (#13866) #14131

Merged
merged 2 commits into from
Dec 19, 2019
Merged

session: fix show variable result of tidb_enable_window_function after upgrade (#13866) #14131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b86f12e
session: fix `show variable` result of `tidb_enable_window_function` …
lysu Dec 3, 2019
bec46e1
Merge branch 'release-3.0' into release-3.0-093b27aea8ce
sre-bot Dec 19, 2019
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
12 changes: 12 additions & 0 deletions session/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ const (
version34 = 34
version35 = 35
version36 = 36
version37 = 37
)

func checkBootstrapped(s Session) (bool, error) {
Expand Down Expand Up @@ -555,6 +556,10 @@ func upgrade(s Session) {
upgradeToVer36(s)
}

if ver < version37 {
upgradeToVer37(s)
}

updateBootstrapVer(s)
_, err = s.Execute(context.Background(), "COMMIT")

Expand Down Expand Up @@ -877,6 +882,13 @@ func upgradeToVer36(s Session) {
mustExecute(s, "UPDATE HIGH_PRIORITY mysql.user SET Shutdown_priv='Y' where Super_priv = 'Y'")
}

func upgradeToVer37(s Session) {
// when upgrade from old tidb and no 'tidb_enable_window_function' in GLOBAL_VARIABLES, init it with 0.
sql := fmt.Sprintf("INSERT IGNORE INTO %s.%s (`VARIABLE_NAME`, `VARIABLE_VALUE`) VALUES ('%s', '%d')",
mysql.SystemDB, mysql.GlobalVariablesTable, variable.TiDBEnableWindowFunction, 0)
mustExecute(s, sql)
}

// updateBootstrapVer updates bootstrap version variable in mysql.TiDB table.
func updateBootstrapVer(s Session) {
// Update bootstrap version.
Expand Down
2 changes: 1 addition & 1 deletion session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,7 @@ func createSessionWithDomain(store kv.Storage, dom *domain.Domain) (*session, er

const (
notBootstrapped = 0
currentBootstrapVersion = version36
currentBootstrapVersion = version37
)

func getStoreBootstrapVersion(store kv.Storage) int64 {
Expand Down