fix merge

go/test/endtoend/reparent/utils/utils.go

@@ -54,7 +54,7 @@ var (
 	id bigint,
 	msg varchar(64),
 	primary key (id)
-	) Engine=InnoDB
+	) Engine=InnoDB	
 `
 	cell1                  = "zone1"
 	cell2                  = "zone2"
@@ -128,10 +128,6 @@ func setupCluster(ctx context.Context, t *testing.T, shardName string, cells []s
 	shard := &cluster.Shard{Name: shardName}
 	shard.Vttablets = tablets
 
-	disableReplicationFlag := "--disable_active_reparents"
-	if clusterInstance.VtTabletMajorVersion >= 15 {
-		disableReplicationFlag = "--disable-replication-manager"
-	}
 	clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs,
 		"--lock_tables_timeout", "5s",
 		"--track_schema_versions=true",

go/vt/vtgate/semantics/early_rewriter.go

@@ -19,7 +19,6 @@ package semantics
 import (
 	"fmt"
 	"strconv"
-	"strings"
 
 	"vitess.io/vitess/go/vt/vtgate/evalengine"
 

go/vt/vttablet/tabletmanager/rpc_actions.go

@@ -17,7 +17,6 @@ limitations under the License.
 package tabletmanager
 
 import (
-	"errors"
 	"fmt"
 	"time"
 

go/vt/vttablet/tabletserver/schema/engine.go

@@ -741,7 +741,7 @@ func NewEngineForTests() *Engine {
 	se := &Engine{
 		isOpen:    true,
 		tables:    make(map[string]*Table),
-		historian: newHistorian(false, nil),
+		historian: newHistorian(false, 0, nil),
 	}
 	return se
 }

go/vt/vttablet/tabletserver/schema/engine_test.go

@@ -482,7 +482,7 @@ func TestOpenNoErrorDueToInvalidViews(t *testing.T) {
 	db.AddRejectedQuery("SELECT `col1`, `col2` FROM `fakesqldb`.`bar_view` WHERE 1 != 1", mysql.NewSQLError(mysql.ERWrongFieldWithGroup, mysql.SSClientError, "random error for table bar_view"))
 
 	AddFakeInnoDBReadRowsResult(db, 0)
-	se := newEngine(10, 1*time.Second, 1*time.Second, db)
+	se := newEngine(10, 1*time.Second, 1*time.Second, 0, db)
 	err := se.Open()
 	require.NoError(t, err)