diff --git a/br/pkg/streamhelper/basic_lib_for_test.go b/br/pkg/streamhelper/basic_lib_for_test.go index e0956a92c9eee..a44edfecbec6f 100644 --- a/br/pkg/streamhelper/basic_lib_for_test.go +++ b/br/pkg/streamhelper/basic_lib_for_test.go @@ -766,14 +766,11 @@ func (t *testEnv) putTask() { } func (t *testEnv) ScanLocksInOneRegion(bo *tikv.Backoffer, key []byte, maxVersion uint64, limit uint32) ([]*txnlock.Lock, *tikv.KeyLocation, error) { -<<<<<<< HEAD -======= t.mu.Lock() defer t.mu.Unlock() if t.maxTs != maxVersion { return nil, nil, errors.Errorf("unexpect max version in scan lock, expected %d, actual %d", t.maxTs, maxVersion) } ->>>>>>> 6528da5f400 (test: fix data race in scan locks (#57299)) for _, r := range t.regions { if len(r.locks) != 0 { return r.locks, &tikv.KeyLocation{