update

pingcap · Apr 29, 2024 · d188cb2 · d188cb2
1 parent 6f4b136
commit d188cb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/server/mock_conn.go b/pkg/server/mock_conn.go
@@ -114,7 +114,7 @@ func CreateMockConn(t *testing.T, server *Server) MockConn {
 	require.NoError(t, err)
 
 	connID := rand.Uint64()
-	tc, err := server.driver.OpenCtx(connID, 0, uint16(tmysql.DefaultCollationID), "", nil, extensions.NewSessionExtensions())
+	tc, err := server.driver.OpenCtx(connID, 0, tmysql.DefaultCollationID, "", nil, extensions.NewSessionExtensions())
 	require.NoError(t, err)
 
 	cc := &clientConn{

diff --git a/pkg/store/mockstore/unistore/cophandler/cop_handler_test.go b/pkg/store/mockstore/unistore/cophandler/cop_handler_test.go
@@ -108,7 +108,7 @@ func prepareTestTableData(keyNumber int, tableID int64) (*data, error) {
 		colInfos[i] = &tipb.ColumnInfo{
 			ColumnId:  colIds[i],
 			Tp:        int32(colTypes[i].GetType()),
-			Collation: mysql.DefaultCollationID,
+			Collation: int32(mysql.DefaultCollationID),
 		}
 		colTypeMap[colIds[i]] = colTypes[i]
 	}