cherry pick #19562 to release-4.0 (#19895)

pingcap · Sep 9, 2020 · 125258b · 125258b
1 parent f9bc29b
commit 125258b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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() {