fix error return

Author: jianhaiqing

canal/canal.go

@@ -129,7 +129,7 @@ func (c *Canal) validateSetGtidPurged() error {
 		if err != nil {
 			return errors.Trace(err)
 		} else if f, _ := res.GetString(0, 1); f != "ON" {
-			return errors.Errorf("set-gtid-purged: %s, gtid_mode should be ON %s, but now is ", c.cfg.Dump.GtidPurged, f)
+			return errors.Errorf("set-gtid-purged: %s, gtid_mode should be ON, but now is %s", c.cfg.Dump.GtidPurged, f)
 		}
 		return nil
 	}

dump/parser.go

@@ -70,14 +70,14 @@ func Parse(r io.Reader, h ParseHandler, parseBinlogPos bool) error {
 			if m := oneGtidExp.FindAllStringSubmatch(line, -1); len(m) == 1 {
 				gset := m[0][1]
 				if err := h.UpdateGtidFromPurged(gset); err != nil {
-					errors.Trace(err)
+					return errors.Trace(err)
 				}
 				gtidDoneParsed = true
 			}
 			if m := mutilGtidStartExp.FindAllStringSubmatch(line, -1); len(m) == 1 {
 				gset := m[0][1]
 				if err := h.UpdateGtidFromPurged(gset); err != nil {
-					errors.Trace(err)
+					return errors.Trace(err)
 				}
 				mutilGtidParsed = true
 			}
@@ -86,15 +86,15 @@ func Parse(r io.Reader, h ParseHandler, parseBinlogPos bool) error {
 				if m := midUuidSet.FindAllStringSubmatch(line, -1); len(m) == 1 {
 					gset := m[0][1]
 					if err := h.UpdateGtidFromPurged(gset); err != nil {
-						errors.Trace(err)
+						return errors.Trace(err)
 					}
 
 				}
 
 				if m := endUuidSet.FindAllStringSubmatch(line, -1); len(m) == 1 {
 					gset := m[0][1]
 					if err := h.UpdateGtidFromPurged(gset); err != nil {
-						errors.Trace(err)
+						return errors.Trace(err)
 					}
 					gtidDoneParsed = true
 				}
@@ -107,11 +107,11 @@ func Parse(r io.Reader, h ParseHandler, parseBinlogPos bool) error {
 				name := m[0][1]
 				pos, err := strconv.ParseUint(m[0][2], 10, 64)
 				if err != nil {
-					errors.Errorf("parse binlog %v err, invalid number", line)
+					return errors.Errorf("parse binlog %v err, invalid number", line)
 				}
 
 				if err = h.BinLog(name, pos); err != nil && err != ErrSkip {
-					errors.Trace(err)
+					return errors.Trace(err)
 				}
 
 				binlogParsed = true