Additional fixups

Signed-off-by: Matt Lord <mattalord@gmail.com>
vitessio · Sep 14, 2023 · c870ee7 · c870ee7
1 parent 6006766
commit c870ee7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go
@@ -480,12 +480,8 @@ func testPlayerCopyTablesWithFK(t *testing.T) {
 	expectDBClientQueries(t, qh.Expect(
 		"/insert into _vt.vreplication",
 		"/update _vt.vreplication set message='Picked source tablet.*",
-<<<<<<< HEAD
-		"select @@foreign_key_checks;",
-=======
 		"/SELECT rows_copied FROM _vt.vreplication WHERE id=.+",
 		"select @@foreign_key_checks",
->>>>>>> a159f18719 (copy over existing vreplication rows copied to local counter if resuming from another tablet (#13949))
 		// Create the list of tables to copy and transition to Copying state.
 		"begin",
 		"/insert into _vt.copy_state",

diff --git a/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go b/go/vt/vttablet/tabletmanager/vreplication/vreplicator_test.go
@@ -652,7 +652,6 @@ func TestResumingFromPreviousWorkflowKeepingRowsCopied(t *testing.T) {
 
 	vsclient := newTabletConnector(tablet)
 	stats := binlogplayer.NewStats()
-	defer stats.Stop()
 
 	dbaconn := playerEngine.dbClientFactoryDba()
 	err := dbaconn.Connect()