This is an automated cherry-pick of #55596

Signed-off-by: ti-chi-bot <[email protected]>

pkg/executor/analyze.go

@@ -459,13 +459,24 @@ func (e *AnalyzeExec) handleResultsErrorWithConcurrency(ctx context.Context, sta
 	partitionStatsConcurrency := len(subSctxs)
 
 	wg := util.NewWaitGroupPool(e.gp)
+<<<<<<< HEAD
 	saveResultsCh := make(chan *statistics.AnalyzeResults, partitionStatsConcurrency)
 	errCh := make(chan error, partitionStatsConcurrency)
 	for i := 0; i < partitionStatsConcurrency; i++ {
 		worker := newAnalyzeSaveStatsWorker(saveResultsCh, subSctxs[i], errCh, &e.Ctx().GetSessionVars().SQLKiller)
 		ctx1 := kv.WithInternalSourceType(context.Background(), kv.InternalTxnStats)
 		wg.Run(func() {
 			worker.run(ctx1, e.Ctx().GetSessionVars().EnableAnalyzeSnapshot)
+=======
+	saveResultsCh := make(chan *statistics.AnalyzeResults, saveStatsConcurrency)
+	errCh := make(chan error, saveStatsConcurrency)
+	enableAnalyzeSnapshot := e.Ctx().GetSessionVars().EnableAnalyzeSnapshot
+	for i := 0; i < saveStatsConcurrency; i++ {
+		worker := newAnalyzeSaveStatsWorker(saveResultsCh, errCh, &e.Ctx().GetSessionVars().SQLKiller)
+		ctx1 := kv.WithInternalSourceType(context.Background(), kv.InternalTxnStats)
+		wg.Run(func() {
+			worker.run(ctx1, statsHandle, enableAnalyzeSnapshot)
+>>>>>>> b02581a7a47 (*: fix data race in the EnableAnalyzeSnapshot (#55596))
 		})
 	}
 	tableIDs := map[int64]struct{}{}

pkg/executor/test/analyzetest/BUILD.bazel

@@ -9,6 +9,7 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 49,
     deps = [
         "//pkg/config",

pkg/executor/test/analyzetest/memorycontrol/BUILD.bazel

@@ -8,6 +8,7 @@ go_test(
         "memory_control_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 5,
     deps = [
         "//pkg/config",