This is an automated cherry-pick of pingcap#46419

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Sep 20, 2023 · c142bac · c142bac
1 parent 71bcc44
commit c142bac
Show file tree

Hide file tree

Showing 3 changed files with 2,100 additions and 0 deletions.
diff --git a/executor/analyzetest/BUILD.bazel b/executor/analyzetest/BUILD.bazel
@@ -8,7 +8,11 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+<<<<<<< HEAD:executor/analyzetest/BUILD.bazel
     shard_count = 50,
+=======
+    shard_count = 27,
+>>>>>>> b823a1deb97 (planner: fix group_concat function couldn't resolve the index of its order-by item (#46419)):expression/integration_test/BUILD.bazel
     deps = [
         "//domain",
         "//domain/infosync",