cherry pick #1122 to release-2.0 (#1123)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com> Co-authored-by: lance6716 <lance6716@gmail.com>
pingcap · Sep 30, 2020 · dc033a3 · dc033a3
1 parent b779584
commit dc033a3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/pkg/dumpling/utils.go b/pkg/dumpling/utils.go
@@ -57,6 +57,10 @@ func ParseMetaData(filename, flavor string) (*binlog.Location, *binlog.Location,
 			if err2 != nil {
 				return err2
 			}
+			line = strings.TrimSpace(line)
+			if len(line) == 0 {
+				return nil
+			}
 			parts := strings.SplitN(line, ":", 2)
 			if len(parts) != 2 {
 				continue

diff --git a/pkg/dumpling/utils_test.go b/pkg/dumpling/utils_test.go
@@ -205,6 +205,30 @@ Finished dump at: 2020-05-21 18:14:49`,
 			},
 			"5b5a8e4e-9b43-11ea-900d-0242ac170002:1-10,5b642cb6-9b43-11ea-8914-0242ac170003:1-9,97b5142f-e19c-11e8-808c-0242ac110005:1-13",
 		},
+		{ // no GTID sets
+			`Started dump at: 2020-09-30 12:16:49
+SHOW MASTER STATUS:
+	Log: mysql-bin-changelog.000003
+	Pos: 12470000
+
+SHOW MASTER STATUS: /* AFTER CONNECTION POOL ESTABLISHED */
+	Log: mysql-bin-changelog.000003
+	Pos: 12470000
+
+Finished dump at: 2020-09-30 12:16:49
+`,
+			mysql.Position{
+				Name: "mysql-bin-changelog.000003",
+				Pos:  12470000,
+			},
+			"",
+			true,
+			mysql.Position{
+				Name: "mysql-bin-changelog.000003",
+				Pos:  12470000,
+			},
+			"",
+		},
 	}
 
 	for _, tc := range testCases {