Remove set names binary in controller

Signed-off-by: Matt Lord <[email protected]>
vitessio · Dec 9, 2024 · c9cf71c · c9cf71c
1 parent 3c337a4
commit c9cf71c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go b/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go
@@ -1753,7 +1753,7 @@ func addInvariants(dbClient *binlogplayer.MockDBClient, vreplID, sourceTabletUID
 		fmt.Sprintf("%s||0|0|Stopped|1|%s|0|0", position, workflow),
 	))
 	dbClient.AddInvariant(setSessionTZ, &sqltypes.Result{})
-	dbClient.AddInvariant(setNames, &sqltypes.Result{})
+	//dbClient.AddInvariant(setNames, &sqltypes.Result{})
 	dbClient.AddInvariant(setNetReadTimeout, &sqltypes.Result{})
 	dbClient.AddInvariant(setNetWriteTimeout, &sqltypes.Result{})
 

diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller.go b/go/vt/vttablet/tabletmanager/vreplication/controller.go
@@ -215,11 +215,6 @@ func setDBClientSettings(dbClient binlogplayer.DBClient, workflowConfig *vttable
 	if _, err := dbClient.ExecuteFetch("set @@session.time_zone = '+00:00'", maxRows); err != nil {
 		return err
 	}
-	// Tables may have varying character sets. To ship the bits without interpreting them
-	// we set the character set to be binary.
-	if _, err := dbClient.ExecuteFetch("set names 'binary'", maxRows); err != nil {
-		return err
-	}
 	if _, err := dbClient.ExecuteFetch(fmt.Sprintf("set @@session.net_read_timeout = %v",
 		workflowConfig.NetReadTimeout), maxRows); err != nil {
 		return err

diff --git a/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go b/go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go
@@ -595,6 +595,7 @@ func execParsedQuery(pq *sqlparser.ParsedQuery, bindvars map[string]*querypb.Bin
 	if err != nil {
 		return nil, err
 	}
+	log.Errorf("DEBUG: vplayer execParsedQuery: query: %s", query)
 	return executor(query)
 }