diff --git a/go/vt/schema/ddl_strategy.go b/go/vt/schema/ddl_strategy.go index 536ca93a447..05e2e15c1f5 100644 --- a/go/vt/schema/ddl_strategy.go +++ b/go/vt/schema/ddl_strategy.go @@ -173,12 +173,6 @@ func (setting *DDLStrategySetting) IsVreplicationTestSuite() bool { return setting.hasFlag(vreplicationTestSuite) } -// IsSkipTopoFlag returns 'true' if strategy options include `-skip-topo`. This flag is deprecated, -// and this function is temporary in v14 so that we can print a deprecation message. -func (setting *DDLStrategySetting) IsSkipTopoFlag() bool { - return setting.hasFlag(skipTopoFlag) -} - // RuntimeOptions returns the options used as runtime flags for given strategy, removing any internal hint options func (setting *DDLStrategySetting) RuntimeOptions() []string { opts, _ := shlex.Split(setting.Options) diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go index fc1e137cdf1..baac1a8ca19 100644 --- a/go/vt/vtctl/vtctl.go +++ b/go/vt/vtctl/vtctl.go @@ -3081,12 +3081,6 @@ func commandApplySchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl return fmt.Errorf("the argument is required for the commandApplySchema command") } - // v14 deprecates `--skip-topo` flag. This check will be removed in v15 - if settings, _ := schema.ParseDDLStrategy(*ddlStrategy); settings != nil && settings.IsSkipTopoFlag() { - deprecationMessage := `--skip-topo flag is deprecated and will be removed in v15` - log.Warningf(deprecationMessage) - } - keyspace := subFlags.Arg(0) change, err := getFileParam(*sql, *sqlFile, "sql") if err != nil {