add back ReplicaTermFor

Author: meiji163

go/logic/inspect.go

@@ -384,7 +384,7 @@ func (this *Inspector) applyBinlogFormat() error {
 
 // validateBinlogs checks that binary log configuration is good to go
 func (this *Inspector) validateBinlogs() error {
-	query := `select @@global.log_bin, @@global.binlog_format`
+	query := `select /* gh-ost */@@global.log_bin, @@global.binlog_format`
 	var hasBinaryLogs bool
 	if err := this.db.QueryRow(query).Scan(&hasBinaryLogs, &this.migrationContext.OriginalBinlogFormat); err != nil {
 		return err

go/mysql/utils.go

@@ -173,12 +173,12 @@ func GetReplicationBinlogCoordinates(dbVersion string, db *gosql.DB, gtid bool)
 			}
 		} else {
 			readBinlogCoordinates = NewFileBinlogCoordinates(
-				m.GetString("Master_Log_File"),
-				m.GetInt64("Read_Master_Log_Pos"),
+				m.GetString(ReplicaTermFor(dbVersion, "Master_Log_File")),
+				m.GetInt64(ReplicaTermFor(dbVersion, "Read_Master_Log_Pos")),
 			)
 			executeBinlogCoordinates = NewFileBinlogCoordinates(
-				m.GetString("Relay_Master_Log_File"),
-				m.GetInt64("Exec_Master_Log_Pos"),
+				m.GetString(ReplicaTermFor(dbVersion, "Relay_Master_Log_File")),
+				m.GetInt64(ReplicaTermFor(dbVersion, "Exec_Master_Log_Pos")),
 			)
 		}
 		return nil