executor: fix data race in test (#20142) (#20146)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
pingcap · Oct 3, 2020 · e463853 · e463853
1 parent 4600ca1
commit e463853
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/executor/join_test.go b/executor/join_test.go
@@ -2090,8 +2090,14 @@ func (s *testSuiteJoinSerial) TestInlineProjection4HashJoinIssue15316(c *C) {
 }
 
 func (s *testSuiteJoinSerial) TestIssue18070(c *C) {
-	config.GetGlobalConfig().OOMAction = config.OOMActionCancel
-	defer func() { config.GetGlobalConfig().OOMAction = config.OOMActionLog }()
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.OOMAction = config.OOMActionCancel
+	})
+	defer func() {
+		config.UpdateGlobal(func(conf *config.Config) {
+			conf.OOMAction = config.OOMActionLog
+		})
+	}()
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists t1, t2")