This is an automated cherry-pick of pingcap#53237

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

Author: winoros

planner/core/rule_column_pruning.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/expression/aggregation"
@@ -31,9 +32,19 @@ import (
 type columnPruner struct {
 }
 
+<<<<<<< HEAD:planner/core/rule_column_pruning.go
 func (*columnPruner) optimize(_ context.Context, lp LogicalPlan, opt *logicalOptimizeOp) (LogicalPlan, error) {
 	err := lp.PruneColumns(lp.Schema().Columns, opt)
 	return lp, err
+=======
+func (*columnPruner) optimize(_ context.Context, lp base.LogicalPlan, opt *optimizetrace.LogicalOptimizeOp) (base.LogicalPlan, bool, error) {
+	planChanged := false
+	lp, err := lp.PruneColumns(slices.Clone(lp.Schema().Columns), opt)
+	if err != nil {
+		return nil, planChanged, err
+	}
+	return lp, planChanged, nil
+>>>>>>> 6612270cc58 (planner: column pruning should use a shallow copy slice (#53237)):pkg/planner/core/rule_column_pruning.go
 }
 
 // ExprsHasSideEffects checks if any of the expressions has side effects.