Fixes bad conflict resolution

Signed-off-by: Rafael Chacon <[email protected]>
planetscale · May 5, 2021 · 5501139 · 5501139
1 parent 2e35451
commit 5501139
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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
 	}