Skip to content

Commit

Permalink
bug fix merge apply diff closed on error channel (#1007)
Browse files Browse the repository at this point in the history
  • Loading branch information
nopcoder authored Dec 6, 2020
1 parent e88f3c7 commit e86f416
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion catalog/mvcc/cataloger_merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ func (c *cataloger) doMerge(ctx context.Context, tx db.Tx, params doDiffParams,
}
}
case err := <-errChan:
return rowsCounter, err
if err != nil {
return rowsCounter, err
}
}
}
}
Expand Down

0 comments on commit e86f416

Please sign in to comment.