From 125258bcbd6cb290839d185a13001d7bf3691ffb Mon Sep 17 00:00:00 2001
From: ti-srebot <66930949+ti-srebot@users.noreply.github.com>
Date: Wed, 9 Sep 2020 11:56:33 +0800
Subject: [PATCH] cherry pick #19562 to release-4.0 (#19895)

---
 store/tikv/region_cache.go | 2 +-
 table/tables/tables.go     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
index 322ded72a66bf..2d5eddbf2a521 100644
--- a/store/tikv/region_cache.go
+++ b/store/tikv/region_cache.go
@@ -750,7 +750,7 @@ func (c *RegionCache) LoadRegionsInKeyRange(bo *Backoffer, startKey, endKey []by
 		}
 		regions = append(regions, batchRegions...)
 		endRegion := batchRegions[len(batchRegions)-1]
-		if endRegion.Contains(endKey) {
+		if endRegion.ContainsByEnd(endKey) {
 			break
 		}
 		startKey = endRegion.EndKey()
diff --git a/table/tables/tables.go b/table/tables/tables.go
index 15cd57aef4dd7..7b1563fa3a879 100644
--- a/table/tables/tables.go
+++ b/table/tables/tables.go
@@ -780,6 +780,9 @@ func (t *TableCommon) RemoveRecord(ctx sessionctx.Context, h int64, r []types.Da
 		}
 		err = t.addDeleteBinlog(ctx, binlogRow, colIDs)
 	}
+	if ctx.GetSessionVars().TxnCtx == nil {
+		return nil
+	}
 	colSize := make(map[int64]int64, len(t.Cols()))
 	sc := ctx.GetSessionVars().StmtCtx
 	for id, col := range t.Cols() {