From 6e88047f181ec8c09c8876bd08dde3319e4a4be5 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 10 Jan 2025 14:28:39 -0500 Subject: [PATCH] Fix conflicts Signed-off-by: Matt Lord --- go/mysql/replication.go | 4 ---- go/test/endtoend/migration/migration_test.go | 8 -------- 2 files changed, 12 deletions(-) diff --git a/go/mysql/replication.go b/go/mysql/replication.go index ee211c71b39..b34e1b500de 100644 --- a/go/mysql/replication.go +++ b/go/mysql/replication.go @@ -17,12 +17,8 @@ limitations under the License. package mysql import ( -<<<<<<< HEAD -======= - "fmt" "math" ->>>>>>> 9b0bbadd8b (Use uint64 for binary log file position (#17472)) "vitess.io/vitess/go/mysql/sqlerror" "vitess.io/vitess/go/vt/proto/vtrpc" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/test/endtoend/migration/migration_test.go b/go/test/endtoend/migration/migration_test.go index b40cf478b48..81fbf20cc2f 100644 --- a/go/test/endtoend/migration/migration_test.go +++ b/go/test/endtoend/migration/migration_test.go @@ -213,19 +213,11 @@ func migrate(t *testing.T, fromdb, toks string, tables []string) { var sqlEscaped bytes.Buffer val.EncodeSQL(&sqlEscaped) query := fmt.Sprintf("insert into _vt.vreplication "+ -<<<<<<< HEAD "(workflow, db_name, source, pos, max_tps, max_replication_lag, tablet_types, time_updated, transaction_timestamp, state) values"+ "('%s', '%s', %s, '', 9999, 9999, 'primary', 0, 0, 'Running')", tables[0], "vt_"+toks, sqlEscaped.String()) fmt.Printf("VReplicationExec: %s\n", query) vttablet := keyspaces[toks].Shards[0].Vttablets[0].VttabletProcess err := clusterInstance.VtctlclientProcess.ExecuteCommand("VReplicationExec", vttablet.TabletPath, query) -======= - "(workflow, db_name, source, pos, max_tps, max_replication_lag, tablet_types, time_updated, transaction_timestamp, state, options) values"+ - "('%s', '%s', %s, '', 9999, 9999, 'primary', 0, 0, 'Running', '{}')", tables[0], "vt_"+toks, sqlEscaped.String()) - fmt.Printf("VReplication insert: %s\n", query) - vttablet := keyspaces[toks].Shards[0].Vttablets[0].Alias - err := clusterInstance.VtctldClientProcess.ExecuteCommand("ExecuteFetchAsDBA", vttablet, query) ->>>>>>> 9b0bbadd8b (Use uint64 for binary log file position (#17472)) require.NoError(t, err) }