Merge pull request go-mysql-org#1 in CDC/library_siddontang-go-mysql from more_patch to master

Jonah George · Jonah George · commit d8c7417054e5 · 2019-04-23T21:08:59.000Z
* commit '508a49d838caa77b4144249ae3cee11c6d06ac7b':
  Fix crash
diff --git a/mysql/mariadb_gtid.go b/mysql/mariadb_gtid.go
@@ -92,7 +92,7 @@ func (gtid *MariadbGTID) forward(newer *MariadbGTID) error {
 		| mysqld-bin.000001 | 2184 | Xid               |       112 |        2215 | COMMIT xid=116      |
 		| mysqld-bin.000001 | 2215 | Gtid              |       111 |        2257 | BEGIN GTID 0-111-6  |
 	*/
-	if newer.SequenceNumber <= gtid.SequenceNumber {
+	if newer.SequenceNumber < gtid.SequenceNumber {
 		log.Warnf("out of order binlog appears with gtid %s vs current position gtid %s", newer, gtid)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (gtid MariadbGTID) forward(newer MariadbGTID) error {`
`92`	`92`	`\| mysqld-bin.000001 \| 2184 \| Xid \| 112 \| 2215 \| COMMIT xid=116 \|`
`93`	`93`	`\| mysqld-bin.000001 \| 2215 \| Gtid \| 111 \| 2257 \| BEGIN GTID 0-111-6 \|`
`94`	`94`	`*/`
`95`		`- if newer.SequenceNumber <= gtid.SequenceNumber {`
	`95`	`+ if newer.SequenceNumber < gtid.SequenceNumber {`
`96`	`96`	`log.Warnf("out of order binlog appears with gtid %s vs current position gtid %s", newer, gtid)`
`97`	`97`	`}`
`98`	`98`