Fix unit test

Signed-off-by: Matt Lord <[email protected]>

go/mysql/binlog_event.go

@@ -21,6 +21,7 @@ import (
 
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/mysql/replication"
+
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 )
 
@@ -220,9 +221,9 @@ type TableMap struct {
 
 	// ColumnCollationIDs contains information about the inherited
 	// or implied column default collation and any explicit per-column
-	// override for character based columns ONLY. This means that the
+	// override for text based columns ONLY. This means that the
 	// array position needs to be mapped to the ordered list of
-	// character based columns in the table.
+	// text based columns in the table.
 	ColumnCollationIDs []collations.ID
 }
 

go/mysql/binlog_event_make_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/mysql/replication"
 
 	"vitess.io/vitess/go/mysql/binlog"
@@ -222,6 +223,7 @@ func TestTableMapEvent(t *testing.T) {
 			0,
 			384, // Length of the varchar field.
 		},
+		ColumnCollationIDs: []collations.ID{},
 	}
 	tm.CanBeNull.Set(1, true)
 	tm.CanBeNull.Set(2, true)
@@ -258,12 +260,13 @@ func TestLargeTableMapEvent(t *testing.T) {
 	}
 
 	tm := &TableMap{
-		Flags:     0x8090,
-		Database:  "my_database",
-		Name:      "my_table",
-		Types:     types,
-		CanBeNull: NewServerBitmap(colLen),
-		Metadata:  metadata,
+		Flags:              0x8090,
+		Database:           "my_database",
+		Name:               "my_table",
+		Types:              types,
+		CanBeNull:          NewServerBitmap(colLen),
+		Metadata:           metadata,
+		ColumnCollationIDs: []collations.ID{},
 	}
 	tm.CanBeNull.Set(1, true)
 	tm.CanBeNull.Set(2, true)

go/mysql/binlog_event_rbr.go

@@ -30,7 +30,7 @@ import (
 // These are the TABLE_MAP_EVENT's optional metadata field types from: libbinlogevents/include/rows_event.h
 // See: https://dev.mysql.com/doc/dev/mysql-server/8.0.34/structbinary__log_1_1Table__map__event_1_1Optional__metadata__fields.html
 const (
-	TableMapSignedness uint64 = iota + 1
+	TableMapSignedness uint8 = iota + 1
 	TableMapDefaultCharset
 	TableMapColumnCharset
 	TableMapColumnName
@@ -120,7 +120,6 @@ func (ev binlogEvent) TableMap(f BinlogFormat) (*TableMap, error) {
 	if result.ColumnCollationIDs, err = readColumnCollationIDs(data, pos, int(columnCount)); err != nil {
 		return nil, err
 	}
-
 	//log.Errorf("DEBUG: table %s; ColumnCollationIDs: %+v", result.Name, result.ColumnCollationIDs)
 
 	return result, nil
@@ -221,14 +220,14 @@ func metadataWrite(data []byte, pos int, typ byte, value uint16) int {
 // readColumnCollationIDs reads from the optional metadata that exists.
 // See: https://github.com/mysql/mysql-server/blob/8.0/libbinlogevents/include/rows_event.h
 // What's included depends on the server configuration:
-// https://dev.mysql.com/doc/refman/8.0/en/replication-options-binary-log.html#sysvar_binlog_row_metadata
+// https://dev.mysql.com/doc/refman/en/replication-options-binary-log.html#sysvar_binlog_row_metadata
 // and the table definition.
-// We only care about the collation IDs of the character based columns and
+// We only care about the collation IDs of the text based columns and
 // this info is provided in all binlog_row_metadata formats.
 func readColumnCollationIDs(data []byte, pos, count int) ([]collations.ID, error) {
 	collationIDs := make([]collations.ID, 0, count)
 	for pos < len(data) {
-		fieldType := uint64(data[pos])
+		fieldType := uint8(data[pos])
 		pos++
 
 		if fieldType == 0 { // Null byte separator

go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go

@@ -285,7 +285,7 @@ func testPlayerCopyVarcharPKCaseInsensitive(t *testing.T) {
 		"/update _vt.vreplication set state='Copying'",
 		// Copy mode.
 		"insert into dst(idc,val) values ('a',1)",
-		`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:\\"a\\"}'.*`,
+		`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:255 flags:20483} rows:{lengths:1 values:\\"a\\"}'.*`,
 		// Copy-catchup mode.
 		`/insert into dst\(idc,val\) select 'B', 3 from dual where \( .* 'B' COLLATE .* \) <= \( .* 'a' COLLATE .* \)`,
 	).Then(func(expect qh.ExpectationSequencer) qh.ExpectationSequencer {
@@ -295,11 +295,11 @@ func testPlayerCopyVarcharPKCaseInsensitive(t *testing.T) {
 		//upd1 := expect.
 		upd1 := expect.Then(qh.Eventually(
 			"insert into dst(idc,val) values ('B',3)",
-			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:\\"B\\"}'.*`,
+			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:255 flags:20483} rows:{lengths:1 values:\\"B\\"}'.*`,
 		))
 		upd2 := expect.Then(qh.Eventually(
 			"insert into dst(idc,val) values ('c',2)",
-			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:45 flags:20483} rows:{lengths:1 values:\\"c\\"}'.*`,
+			`/insert into _vt.copy_state \(lastpk, vrepl_id, table_name\) values \('fields:{name:\\"idc\\" type:VARCHAR charset:255 flags:20483} rows:{lengths:1 values:\\"c\\"}'.*`,
 		))
 		upd1.Then(upd2.Eventually())
 		return upd2

go/vt/vttablet/tabletserver/vstreamer/vstreamer.go

@@ -831,7 +831,7 @@ func (vs *vstreamer) buildTableColumns(tm *mysql.TableMap) ([]*querypb.Field, er
 	// not be overridden. This trust also includes when the schema based field is
 	// binary whereas the TableMap fields is text.
 	for i := range fieldsCopy {
-		if sqltypes.IsText(fields[i].Type) {
+		if sqltypes.IsText(fields[i].Type) && fields[i].Charset != 0 {
 			fieldsCopy[i].Charset = fields[i].Charset
 		}
 	}