From 5501139822e1a166a889765f89ae5cfa9cf261d2 Mon Sep 17 00:00:00 2001 From: Rafael Chacon Date: Tue, 4 May 2021 22:40:26 -0700 Subject: [PATCH] Fixes bad conflict resolution Signed-off-by: Rafael Chacon --- go/vt/vtgate/planbuilder/ddl.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/vt/vtgate/planbuilder/ddl.go b/go/vt/vtgate/planbuilder/ddl.go index d61a8997ced..f0627c8723c 100644 --- a/go/vt/vtgate/planbuilder/ddl.go +++ b/go/vt/vtgate/planbuilder/ddl.go @@ -24,10 +24,11 @@ const ( // This is why we return a compound primitive (DDL) which contains fully populated primitives (Send & OnlineDDL), // and which chooses which of the two to invoke at runtime. func buildGeneralDDLPlan(sql string, ddlStatement sqlparser.DDLStatement, vschema ContextVSchema) (engine.Primitive, error) { - normalDDLPlan, onlineDDLPlan, err := buildDDLPlans(sql, ddlStatement, vschema) if vschema.Destination() != nil { return buildByPassDDLPlan(sql, vschema) } + + normalDDLPlan, onlineDDLPlan, err := buildDDLPlans(sql, ddlStatement, vschema) if err != nil { return nil, err }