From bc5287de962d122d54fecbe1fcfe3c20ce0cc119 Mon Sep 17 00:00:00 2001
From: AndreMouche <AndreMouche@126.com>
Date: Fri, 3 Jan 2025 15:29:12 +0800
Subject: [PATCH] merge master&fix conflicts

Signed-off-by: AndreMouche <AndreMouche@126.com>
---
 txnkv/transaction/prewrite.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/txnkv/transaction/prewrite.go b/txnkv/transaction/prewrite.go
index 7114493a7d..c0bf796848 100644
--- a/txnkv/transaction/prewrite.go
+++ b/txnkv/transaction/prewrite.go
@@ -232,11 +232,11 @@ func (action actionPrewrite) handleSingleBatch(
 	}
 
 	handler := action.newSingleBatchPrewriteReqHandler(c, batch, bo)
-	defer handler.drop(err)
 
 	for {
 		retryable, err := handler.sendReqAndCheck()
 		if !retryable {
+			handler.drop(err)
 			return err
 		}
 	}