diff --git a/br/pkg/version/build/info.go b/br/pkg/version/build/info.go index fae69c6d8a6ae..0965458ed3c0f 100644 --- a/br/pkg/version/build/info.go +++ b/br/pkg/version/build/info.go @@ -24,10 +24,7 @@ var ( ) func getReleaseVersion() string { - if mysql.TiDBReleaseVersion != "None" { - return mysql.TiDBReleaseVersion - } - return "v6.0.0-master" + return mysql.TiDBReleaseVersionFixed } // AppName is a name of a built binary. diff --git a/ddl/ddl.go b/ddl/ddl.go index 80e70eaa00375..f5f4d4f1ed35c 100644 --- a/ddl/ddl.go +++ b/ddl/ddl.go @@ -365,7 +365,7 @@ func (dc *ddlCtx) isOwner() bool { isOwner := dc.ownerManager.IsOwner() logutil.BgLogger().Debug("[ddl] check whether is the DDL owner", zap.Bool("isOwner", isOwner), zap.String("selfID", dc.uuid)) if isOwner { - metrics.DDLCounter.WithLabelValues(metrics.DDLOwner + "_" + mysql.TiDBReleaseVersion).Inc() + metrics.DDLCounter.WithLabelValues(metrics.DDLOwner + "_" + mysql.TiDBReleaseVersionFixed).Inc() } return isOwner } diff --git a/domain/infosync/info.go b/domain/infosync/info.go index f30db9a53d986..612231f138b59 100644 --- a/domain/infosync/info.go +++ b/domain/infosync/info.go @@ -605,7 +605,7 @@ func (is *InfoSyncer) getTopologyInfo() TopologyInfo { dir := path.Dir(s) return TopologyInfo{ ServerVersionInfo: ServerVersionInfo{ - Version: mysql.TiDBReleaseVersion, + Version: mysql.TiDBReleaseVersionFixed, GitHash: is.info.ServerVersionInfo.GitHash, }, IP: is.info.IP, @@ -940,7 +940,7 @@ func getServerInfo(id string, serverIDGetter func() uint64) *ServerInfo { info.Version = mysql.ServerVersion info.GitHash = versioninfo.TiDBGitHash - metrics.ServerInfo.WithLabelValues(mysql.TiDBReleaseVersion, info.GitHash).Set(float64(info.StartTimestamp)) + metrics.ServerInfo.WithLabelValues(mysql.TiDBReleaseVersionFixed, info.GitHash).Set(float64(info.StartTimestamp)) failpoint.Inject("mockServerInfo", func(val failpoint.Value) { if val.(bool) { diff --git a/expression/integration_test.go b/expression/integration_test.go index cf1ab5efa08e5..6629e7b0bdd54 100644 --- a/expression/integration_test.go +++ b/expression/integration_test.go @@ -1338,7 +1338,7 @@ func TestInfoBuiltin(t *testing.T) { tidbVersionResult += fmt.Sprint(line) } lines := strings.Split(tidbVersionResult, "\n") - assert.Equal(t, true, strings.Split(lines[0], " ")[2] == mysql.TiDBReleaseVersion, "errors in 'select tidb_version()'") + assert.Equal(t, true, strings.Split(lines[0], " ")[2] == mysql.TiDBReleaseVersionFixed, "errors in 'select tidb_version()'") assert.Equal(t, true, strings.Split(lines[1], " ")[1] == versioninfo.TiDBEdition, "errors in 'select tidb_version()'") // for row_count diff --git a/parser/mysql/const.go b/parser/mysql/const.go index 8d9396d26e8c8..d93c451f6f8d0 100644 --- a/parser/mysql/const.go +++ b/parser/mysql/const.go @@ -28,10 +28,11 @@ func newInvalidModeErr(s string) error { // Version information. var ( // TiDBReleaseVersion is initialized by (git describe --tags) in Makefile. - TiDBReleaseVersion = "None" + TiDBReleaseVersion = "None" + TiDBReleaseVersionFixed = "v6.2.0" // ServerVersion is the version information of this tidb-server in MySQL's format. - ServerVersion = fmt.Sprintf("5.7.25-TiDB-%s", TiDBReleaseVersion) + ServerVersion = fmt.Sprintf("5.7.25-TiDB-%s", TiDBReleaseVersionFixed) ) // Header information. diff --git a/server/server.go b/server/server.go index bf4d7b8392019..7afa09e14c962 100644 --- a/server/server.go +++ b/server/server.go @@ -596,7 +596,7 @@ func (cc *clientConn) connectInfo() *variable.ConnectionInfo { User: cc.user, ServerOSLoginUser: osUser, OSVersion: osVersion, - ServerVersion: mysql.TiDBReleaseVersion, + ServerVersion: mysql.TiDBReleaseVersionFixed, SSLVersion: "v1.2.0", // for current go version PID: serverPID, DB: cc.dbname, diff --git a/telemetry/data_slow_query.go b/telemetry/data_slow_query.go index 188e2b3a4b5f3..9cfe9596aa4ce 100644 --- a/telemetry/data_slow_query.go +++ b/telemetry/data_slow_query.go @@ -142,7 +142,7 @@ func init() { lastSQBInfo["+Inf"] = 0 currentSQBInfo["+Inf"] = 0 - if mysql.TiDBReleaseVersion != "None" { + if mysql.TiDBReleaseVersionFixed != "None" { logutil.BgLogger().Debug("Telemetry slow query stats initialized", zap.String("currentSQBInfo", currentSQBInfo.String()), zap.String("lastSQBInfo", lastSQBInfo.String())) } } diff --git a/tidb-server/main.go b/tidb-server/main.go index 5a4ef5b62fae2..0355dab04674c 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -546,7 +546,7 @@ func setVersions() { versioninfo.TiDBEdition = cfg.TiDBEdition } if len(cfg.TiDBReleaseVersion) > 0 { - mysql.TiDBReleaseVersion = cfg.TiDBReleaseVersion + mysql.TiDBReleaseVersionFixed = cfg.TiDBReleaseVersion } } @@ -648,7 +648,7 @@ func setGlobalVars() { variable.SetSysVar(variable.VersionComment, cfg.VersionComment) } if len(cfg.TiDBReleaseVersion) > 0 { - mysql.TiDBReleaseVersion = cfg.TiDBReleaseVersion + mysql.TiDBReleaseVersionFixed = cfg.TiDBReleaseVersion } variable.SetSysVar(variable.TiDBForcePriority, mysql.Priority2Str[priority]) diff --git a/util/printer/printer.go b/util/printer/printer.go index 516f3419a7ee6..baaf54d35f87b 100644 --- a/util/printer/printer.go +++ b/util/printer/printer.go @@ -32,7 +32,7 @@ import ( // PrintTiDBInfo prints the TiDB version information. func PrintTiDBInfo() { logutil.BgLogger().Info("Welcome to TiDB.", - zap.String("Release Version", mysql.TiDBReleaseVersion), + zap.String("Release Version", mysql.TiDBReleaseVersionFixed), zap.String("Edition", versioninfo.TiDBEdition), zap.String("Git Commit Hash", versioninfo.TiDBGitHash), zap.String("Git Branch", versioninfo.TiDBGitBranch),