Manual merge resolution

pingcap · Feb 7, 2025 · 11a0620 · 11a0620
1 parent 1b82d36
commit 11a0620
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -4443,9 +4443,6 @@ func convertValueListToData(valueList []ast.ExprNode, handleColInfos []*model.Co
 	return data, nil
 }
 
-<<<<<<< HEAD:planner/core/planbuilder.go
-func (b *PlanBuilder) buildDDL(ctx context.Context, node ast.DDLNode) (Plan, error) {
-=======
 type userVariableChecker struct {
 	hasUserVariables bool
 }
@@ -4472,8 +4469,7 @@ func checkForUserVariables(in ast.Node) error {
 	return nil
 }
 
-func (b *PlanBuilder) buildDDL(ctx context.Context, node ast.DDLNode) (base.Plan, error) {
->>>>>>> 153d5aaa385 (planner: Do not allow variables in create view (#57474)):pkg/planner/core/planbuilder.go
+func (b *PlanBuilder) buildDDL(ctx context.Context, node ast.DDLNode) (Plan, error) {
 	var authErr error
 	switch v := node.(type) {
 	case *ast.AlterDatabaseStmt: