Fix parsing GTIDs from mysqlpdump

dobegor · atercattus · commit 632a7f85089f · 2021-04-08T09:35:53.000+03:00
This address the issue #550. (cherry picked from commit 6f9431a7102cc23e32262dfbf7f0bb74df485545)
diff --git a/dump/parser.go b/dump/parser.go
@@ -34,7 +34,7 @@ func init() {
 	valuesExp = regexp.MustCompile("^INSERT INTO `(.+?)` VALUES \\((.+)\\);$")
 	// The pattern will only match MySQL GTID, as you know SET GLOBAL gtid_slave_pos='0-1-4' is used for MariaDB.
 	//SET @@GLOBAL.GTID_PURGED='1638041a-0457-11e9-bb9f-00505690b730:1-429405150';
-	gtidExp = regexp.MustCompile("(\\w{8}(-\\w{4}){3}-\\w{12}:\\d+-\\d+)")
+	gtidExp = regexp.MustCompile(`(\w{8}(-\w{4}){3}-\w{12}(:\d+-\d+)+)`)
 }
 
 // Parse the dump data with Dumper generate.

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func init() {`
`34`	`34`	valuesExp = regexp.MustCompile("^INSERT INTO `(.+?)` VALUES \\((.+)\\);$")
`35`	`35`	`// The pattern will only match MySQL GTID, as you know SET GLOBAL gtid_slave_pos='0-1-4' is used for MariaDB.`
`36`	`36`	`//SET @@GLOBAL.GTID_PURGED='1638041a-0457-11e9-bb9f-00505690b730:1-429405150';`
`37`		`- gtidExp = regexp.MustCompile("(\\w{8}(-\\w{4}){3}-\\w{12}:\\d+-\\d+)")`
	`37`	+ gtidExp = regexp.MustCompile(`(\w{8}(-\w{4}){3}-\w{12}(:\d+-\d+)+)`)
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Parse the dump data with Dumper generate.`