Skip to content

Commit c9cf71c

Browse files
committed
Remove set names binary in controller
Signed-off-by: Matt Lord <[email protected]>
1 parent 3c337a4 commit c9cf71c

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

go/vt/vttablet/tabletmanager/rpc_vreplication_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ func addInvariants(dbClient *binlogplayer.MockDBClient, vreplID, sourceTabletUID
17531753
fmt.Sprintf("%s||0|0|Stopped|1|%s|0|0", position, workflow),
17541754
))
17551755
dbClient.AddInvariant(setSessionTZ, &sqltypes.Result{})
1756-
dbClient.AddInvariant(setNames, &sqltypes.Result{})
1756+
//dbClient.AddInvariant(setNames, &sqltypes.Result{})
17571757
dbClient.AddInvariant(setNetReadTimeout, &sqltypes.Result{})
17581758
dbClient.AddInvariant(setNetWriteTimeout, &sqltypes.Result{})
17591759

go/vt/vttablet/tabletmanager/vreplication/controller.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@ func setDBClientSettings(dbClient binlogplayer.DBClient, workflowConfig *vttable
215215
if _, err := dbClient.ExecuteFetch("set @@session.time_zone = '+00:00'", maxRows); err != nil {
216216
return err
217217
}
218-
// Tables may have varying character sets. To ship the bits without interpreting them
219-
// we set the character set to be binary.
220-
if _, err := dbClient.ExecuteFetch("set names 'binary'", maxRows); err != nil {
221-
return err
222-
}
223218
if _, err := dbClient.ExecuteFetch(fmt.Sprintf("set @@session.net_read_timeout = %v",
224219
workflowConfig.NetReadTimeout), maxRows); err != nil {
225220
return err

go/vt/vttablet/tabletmanager/vreplication/replicator_plan.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ func execParsedQuery(pq *sqlparser.ParsedQuery, bindvars map[string]*querypb.Bin
595595
if err != nil {
596596
return nil, err
597597
}
598+
log.Errorf("DEBUG: vplayer execParsedQuery: query: %s", query)
598599
return executor(query)
599600
}
600601

0 commit comments

Comments
 (0)