Allow to run all tests with mysql:8 (#765)

allow running all tests with mysql:8

Author: atercattus

.github/workflows/ci.yml

@@ -6,8 +6,9 @@ jobs:
     strategy:
       matrix:
         go: [ 1.19, 1.18, 1.17, 1.16 ]
-    name: Tests Go ${{ matrix.go }}
-    runs-on: ubuntu-18.04
+        os: [ ubuntu-18.04, ubuntu-20.04 ]
+    name: Tests Go ${{ matrix.go }} # This name is used in main branch protection rules
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Setup MySQL
@@ -17,7 +18,11 @@ jobs:
 
           echo -e '[mysqld]\nserver-id=1\nlog-bin=mysql\nbinlog-format=row\ngtid-mode=ON\nenforce_gtid_consistency=ON\n' | sudo tee /etc/mysql/conf.d/replication.cnf
           sudo service mysql start
-          sudo mysql -h 127.0.0.1 -uroot -proot -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;"
+          
+          # apply this for mysql5 & mysql8 compatibility
+          sudo mysql -h 127.0.0.1 -uroot -proot -e "DROP USER IF EXISTS 'mysql.infoschema'@'localhost'; CREATE USER IF NOT EXISTS 'mysql.infoschema'@'localhost' IDENTIFIED BY ''; GRANT SELECT ON *.* TO 'mysql.infoschema'@'localhost';"
+          
+          sudo mysql -h 127.0.0.1 -uroot -proot -e "use mysql; update user set authentication_string=null where User='root'; update user set plugin='mysql_native_password'; FLUSH PRIVILEGES;"
           # create ssl/rsa files for mysql ssl support
           sudo mysql_ssl_rsa_setup --uid=mysql
           mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot

Makefile

@@ -11,12 +11,13 @@ build:
 test:
 	go test --race -timeout 2m ./...
 
+MYSQL_VERSION ?= 5.7
 test-local:
 	docker run --rm -d --network=host --name go-mysql-server \
 		-e MYSQL_ALLOW_EMPTY_PASSWORD=true \
 		-e MYSQL_DATABASE=test \
 		-v $${PWD}/docker/resources/replication.cnf:/etc/mysql/conf.d/replication.cnf \
-		mysql:5.7
+		mysql:$(MYSQL_VERSION)
 	docker/resources/waitfor.sh 127.0.0.1 3306 \
 		&& go test -race -v -timeout 2m ./... -gocheck.v
 	docker stop go-mysql-server

client/auth.go

@@ -43,7 +43,9 @@ func (c *Conn) readInitialHandshake() error {
 
 	// skip mysql version
 	// mysql version end with 0x00
-	pos := 1 + bytes.IndexByte(data[1:], 0x00) + 1
+	version := data[1 : bytes.IndexByte(data[1:], 0x00)+1]
+	c.serverVersion = string(version)
+	pos := 1 + len(version)
 
 	// connection id length is 4
 	c.connectionID = binary.LittleEndian.Uint32(data[pos : pos+4])
@@ -68,7 +70,7 @@ func (c *Conn) readInitialHandshake() error {
 
 	if len(data) > pos {
 		// skip server charset
-		//c.charset = data[pos]
+		// c.charset = data[pos]
 		pos += 1
 
 		c.status = binary.LittleEndian.Uint16(data[pos : pos+2])
@@ -194,14 +196,14 @@ func (c *Conn) writeAuthHandshake() error {
 		capability |= CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA
 	}
 
-	//packet length
-	//capability 4
-	//max-packet size 4
-	//charset 1
-	//reserved all[0] 23
-	//username
-	//auth
-	//mysql_native_password + null-terminated
+	// packet length
+	// capability 4
+	// max-packet size 4
+	// charset 1
+	// reserved all[0] 23
+	// username
+	// auth
+	// mysql_native_password + null-terminated
 	length := 4 + 4 + 1 + 23 + len(c.user) + 1 + len(authRespLEI) + len(auth) + 21 + 1
 	if addNull {
 		length++

client/conn.go

@@ -24,6 +24,7 @@ type Conn struct {
 	tlsConfig *tls.Config
 	proto     string
 
+	serverVersion string
 	// server capabilities
 	capability uint32
 	// client-set capabilities only
@@ -193,6 +194,10 @@ func (c *Conn) GetDB() string {
 	return c.db
 }
 
+func (c *Conn) GetServerVersion() string {
+	return c.serverVersion
+}
+
 func (c *Conn) Execute(command string, args ...interface{}) (*Result, error) {
 	if len(args) == 0 {
 		return c.exec(command)

go.mod

@@ -15,5 +15,6 @@ require (
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
 	github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
 	github.com/stretchr/testify v1.8.0
+	golang.org/x/mod v0.3.0
 	golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b // indirect
 )

go.sum

@@ -73,6 +73,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

replication/replication_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/google/uuid"
 	. "github.com/pingcap/check"
+	"golang.org/x/mod/semver"
 
 	"github.com/go-mysql-org/go-mysql/client"
 	"github.com/go-mysql-org/go-mysql/mysql"
@@ -88,7 +89,7 @@ func (t *testSyncerSuite) testSync(c *C, s *BinlogStreamer) {
 		}
 	}()
 
-	//use mixed format
+	// use mixed format
 	t.testExecute(c, "SET SESSION binlog_format = 'MIXED'")
 
 	str := `DROP TABLE IF EXISTS test_replication`
@@ -117,7 +118,7 @@ func (t *testSyncerSuite) testSync(c *C, s *BinlogStreamer) {
 
 	t.testExecute(c, str)
 
-	//use row format
+	// use row format
 	t.testExecute(c, "SET SESSION binlog_format = 'ROW'")
 
 	t.testExecute(c, `INSERT INTO test_replication (str, f, i, e, b, y, da, ts, dt, tm, de, t, bb, se)
@@ -294,7 +295,7 @@ func (t *testSyncerSuite) setupTest(c *C, flavor string) {
 }
 
 func (t *testSyncerSuite) testPositionSync(c *C) {
-	//get current master binlog file and position
+	// get current master binlog file and position
 	r, err := t.c.Execute("SHOW MASTER STATUS")
 	c.Assert(err, IsNil)
 	binFile, _ := r.GetString(0, 0)
@@ -303,11 +304,18 @@ func (t *testSyncerSuite) testPositionSync(c *C) {
 	s, err := t.b.StartSync(mysql.Position{Name: binFile, Pos: uint32(binPos)})
 	c.Assert(err, IsNil)
 
-	// check we have set Slave_UUID
 	r, err = t.c.Execute("SHOW SLAVE HOSTS")
 	c.Assert(err, IsNil)
-	slaveUUID, _ := r.GetString(0, 4)
-	c.Assert(slaveUUID, HasLen, 36)
+
+	// List of replicas must not be empty
+	c.Assert(r.Values, Not(HasLen), 0)
+
+	// Slave_UUID is empty for mysql 8.0.28+ (8.0.32 still broken)
+	if semver.Compare(t.c.GetServerVersion(), "8.0.28") < 0 {
+		// check we have set Slave_UUID
+		slaveUUID, _ := r.GetString(0, 4)
+		c.Assert(slaveUUID, HasLen, 36)
+	}
 
 	// Test re-sync.
 	time.Sleep(100 * time.Millisecond)