octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nm-refactor-migration-context

Browse Source
This commit is contained in:
Nikhil Mathew 2017-10-02 10:31:57 -07:00
commit f06e23282e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE_VERSION
View File

@ -1 +1 @@
1.0.40
1.0.42

2
go/base/context.go
View File

@ -714,7 +714,7 @@ func (this *MigrationContext) ReadConfigFile() error {
gcfg.RelaxedParserMode = true
gcfgscanner.RelaxedScannerMode = true
if err := gcfg.ReadFileInto(&this.config, this.ConfigFile); err != nil {
return err
return fmt.Errorf("Error reading config file %s. Details: %s", this.ConfigFile, err.Error())
}
// We accept user & password in the form "${SOME_ENV_VARIABLE}" in which case we pull

2
go/logic/migrator.go
View File

@ -926,7 +926,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {
}
}
// initiateStreaming begins treaming of binary log events and registers listeners for such events
// initiateStreaming begins streaming of binary log events and registers listeners for such events
func (this *Migrator) initiateStreaming() error {
this.eventsStreamer = NewEventsStreamer(this.migrationContext)
if err := this.eventsStreamer.InitDBConnections(); err != nil {