This is an automated cherry-pick of pingcap#46450

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Sep 4, 2023 · 53afad4 · 53afad4
1 parent e2ba276
commit 53afad4
Show file tree

Hide file tree

Showing 4 changed files with 2,289 additions and 3 deletions.
diff --git a/planner/core/BUILD.bazel b/planner/core/BUILD.bazel
@@ -198,7 +198,11 @@ go_test(
         "point_get_plan_test.go",
         "prepare_test.go",
         "preprocess_test.go",
+<<<<<<< HEAD
         "rule_inject_extra_projection_test.go",
+=======
+        "rule_generate_column_substitute_test.go",
+>>>>>>> 41c16424ac0 (planner: don't recompute the hashcode when generated column substitution doesn't happen (#46450))
         "rule_join_reorder_dp_test.go",
         "rule_join_reorder_test.go",
         "rule_result_reorder_test.go",