This is an automated cherry-pick of pingcap#48430

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Nov 9, 2023 · ba1b789 · ba1b789
1 parent 52c6053
commit ba1b789
Show file tree

Hide file tree

Showing 2 changed files with 427 additions and 0 deletions.
diff --git a/executor/historical_stats_test.go b/executor/historical_stats_test.go
@@ -237,8 +237,15 @@ func TestAssertHistoricalStatsAfterAlterTable(t *testing.T) {
 }
 
 func TestGCOutdatedHistoryStats(t *testing.T) {
+<<<<<<< HEAD:executor/historical_stats_test.go
 	failpoint.Enable("github.com/pingcap/tidb/domain/sendHistoricalStats", "return(true)")
 	defer failpoint.Disable("github.com/pingcap/tidb/domain/sendHistoricalStats")
+=======
+	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/domain/sendHistoricalStats", "return(true)"))
+	defer func() {
+		require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/domain/sendHistoricalStats"))
+	}()
+>>>>>>> ad6385ab30a (statistics: avoid oom when to gc large stats_history (#48430)):pkg/executor/historical_stats_test.go
 	store, dom := testkit.CreateMockStoreAndDomain(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set global tidb_enable_historical_stats = 1")