This is an automated cherry-pick of pingcap#53298

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · May 31, 2024 · fdeed1b · fdeed1b
1 parent d9c5bf6
commit fdeed1b
Show file tree

Hide file tree

Showing 3 changed files with 1,165 additions and 0 deletions.
diff --git a/ddl/metadatalocktest/BUILD.bazel b/ddl/metadatalocktest/BUILD.bazel
@@ -9,13 +9,22 @@ go_test(
     flaky = True,
     shard_count = 34,
     deps = [
+<<<<<<< HEAD:ddl/metadatalocktest/BUILD.bazel
         "//config",
         "//ddl",
         "//errno",
         "//server",
         "//testkit",
         "//testkit/testsetup",
         "//util/logutil",
+=======
+        "//pkg/config",
+        "//pkg/parser/model",
+        "//pkg/parser/mysql",
+        "//pkg/statistics/handle/internal",
+        "//pkg/testkit",
+        "//pkg/testkit/testsetup",
+>>>>>>> 687f39c12f8 (statistics: fix wrong behavior for primary key' non-lite init stats (#53298)):pkg/statistics/handle/handletest/statstest/BUILD.bazel
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_stretchr_testify//require",
         "@org_uber_go_goleak//:goleak",