Skip to content

Commit

Permalink
Merge branch 'master' into fk-check-var-enable-default
Browse files Browse the repository at this point in the history
  • Loading branch information
@crazycs520
crazycs520 authored Dec 7, 2022
2 parents b2a6906 + 8e742bf commit bff6ea7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions session/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -730,13 +730,13 @@ const (
version106 = 106
// version107 add columns related to password expiration into mysql.user
version107 = 107
// version107 adds the table tidb_ttl_table_status
// version108 adds the table tidb_ttl_table_status
version108 = 108
)

// currentBootstrapVersion is defined as a variable, so we can modify its value for testing.
// please make sure this is the largest version
var currentBootstrapVersion int64 = version107
var currentBootstrapVersion int64 = version108

// DDL owner key's expired time is ManagerSessionTTL seconds, we should wait the time and give more time to have a chance to finish it.
var internalSQLTimeout = owner.ManagerSessionTTL + 15
Expand Down

0 comments on commit bff6ea7

Please sign in to comment.