Skip to content

Commit 0bcb15e

Browse files
Add @@version_comment
1 parent 35a9cbb commit 0bcb15e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

go/logic/applier.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@ func (this *Applier) InitDBConnections() (err error) {
9898
if err := this.readTableColumns(); err != nil {
9999
return err
100100
}
101-
this.migrationContext.Log.Infof("Applier initiated on %+v, version %+v", this.connectionConfig.ImpliedKey,
102-
this.migrationContext.ApplierServerInfo.Version)
101+
this.migrationContext.Log.Infof("Applier initiated on %+v, version %+v (%+v)", this.connectionConfig.ImpliedKey,
102+
this.migrationContext.ApplierServerInfo.Version,
103+
this.migrationContext.ApplierServerInfo.VersionComment,
104+
)
103105
return nil
104106
}
105107

go/mysql/server_info.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import gosql "database/sql"
55
// ServerInfo represents the online config of a MySQL server.
66
type ServerInfo struct {
77
Version string
8+
VersionComment string
89
Hostname string
910
Port gosql.NullInt64
1011
BinlogFormat string
@@ -22,13 +23,12 @@ type ServerInfo struct {
2223
// the online config of a MySQL server.
2324
func GetServerInfo(db *gosql.DB) (*ServerInfo, error) {
2425
var info ServerInfo
25-
query := `select /* gh-ost */ @@global.version, @@global.hostname, @@global.port,
26-
@@global.binlog_format, @@global.binlog_row_image, @@global.log_bin,
26+
query := `select /* gh-ost */ @@global.version, @@global.version_comment, @@global.hostname,
27+
@@global.port, @@global.binlog_format, @@global.binlog_row_image, @@global.log_bin,
2728
@@global.log_slave_updates, @@global.sql_mode, @@global.time_zone`
28-
if err := db.QueryRow(query).Scan(&info.Version, &info.Hostname,
29-
&info.Port, &info.BinlogFormat, &info.BinlogRowImage,
30-
&info.LogBin, &info.LogSlaveUpdates, &info.SQLMode,
31-
&info.TimeZone,
29+
if err := db.QueryRow(query).Scan(&info.Version, &info.VersionComment, &info.Hostname,
30+
&info.Port, &info.BinlogFormat, &info.BinlogRowImage, &info.LogBin,
31+
&info.LogSlaveUpdates, &info.SQLMode, &info.TimeZone,
3232
); err != nil {
3333
return nil, err
3434
}

0 commit comments

Comments
 (0)