Merge branch 'master' into fix-charset

dm-2 · web-flow · commit 9c2c7bad1b40 · 2022-09-06T11:44:07.000+01:00
diff --git a/go/logic/applier.go b/go/logic/applier.go
@@ -48,7 +48,7 @@ func newDmlBuildResultError(err error) *dmlBuildResult {
 	}
 }
 
-// Applier connects and writes the the applier-server, which is the server where migration
+// Applier connects and writes the applier-server, which is the server where migration
 // happens. This is typically the master, but could be a replica when `--test-on-replica` or
 // `--execute-on-replica` are given.
 // Applier is the one to actually write row data and apply binlog events onto the ghost table.

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func newDmlBuildResultError(err error) *dmlBuildResult {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-// Applier connects and writes the the applier-server, which is the server where migration`
	`51`	`+// Applier connects and writes the applier-server, which is the server where migration`
`52`	`52`	// happens. This is typically the master, but could be a replica when `--test-on-replica` or
`53`	`53`	// `--execute-on-replica` are given.
`54`	`54`	`// Applier is the one to actually write row data and apply binlog events onto the ghost table.`