From c3497c84ed7860fe3accbcd648d7bebfe49de02b Mon Sep 17 00:00:00 2001
From: Ted Yu <yuzhihong@gmail.com>
Date: Wed, 22 Jan 2020 11:03:23 -0800
Subject: [PATCH] mvcc: use correct error variable in defragdb (#11527)

Co-authored-by: yutedz <54038175+yutedz@users.noreply.github.com>
---
 mvcc/backend/backend.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go
index 73a84020f..e4a55aefb 100644
--- a/mvcc/backend/backend.go
+++ b/mvcc/backend/backend.go
@@ -498,7 +498,7 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
 		}
 		tmpb.FillPercent = 0.9 // for seq write in for each
 
-		if pErr := b.ForEach(func(k, v []byte) error {
+		if err = b.ForEach(func(k, v []byte) error {
 			count++
 			if count > limit {
 				err = tmptx.Commit()
@@ -515,8 +515,8 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
 				count = 0
 			}
 			return tmpb.Put(k, v)
-		}); pErr != nil {
-			return pErr
+		}); err != nil {
+			return err
 		}
 	}