From c14c892f9a1b39a09e4089fca54f001674ff0421 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Mon, 13 Dec 2021 17:50:35 +0800 Subject: [PATCH 1/2] fix that forget to readOK after writing --- client/resp.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/resp.go b/client/resp.go index 30584d36b..df21ae2a6 100644 --- a/client/resp.go +++ b/client/resp.go @@ -7,10 +7,11 @@ import ( "encoding/binary" "encoding/pem" - . "github.com/go-mysql-org/go-mysql/mysql" - "github.com/go-mysql-org/go-mysql/utils" "github.com/pingcap/errors" "github.com/siddontang/go/hack" + + . "github.com/go-mysql-org/go-mysql/mysql" + "github.com/go-mysql-org/go-mysql/utils" ) func (c *Conn) readUntilEOF() (err error) { @@ -142,6 +143,9 @@ func (c *Conn) handleAuthResult() error { if err = c.WritePublicKeyAuthPacket(c.password, c.salt); err != nil { return err } + if _, err = c.readOK(); err != nil { + return err + } } } else { return errors.Errorf("invalid packet %x", data[0]) From 0734e96b9bbc9edeb1816424eb4d21c66dec97cd Mon Sep 17 00:00:00 2001 From: lance6716 Date: Mon, 13 Dec 2021 17:54:52 +0800 Subject: [PATCH 2/2] move to outer loop --- client/resp.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/resp.go b/client/resp.go index df21ae2a6..21374e467 100644 --- a/client/resp.go +++ b/client/resp.go @@ -143,9 +143,9 @@ func (c *Conn) handleAuthResult() error { if err = c.WritePublicKeyAuthPacket(c.password, c.salt); err != nil { return err } - if _, err = c.readOK(); err != nil { - return err - } + } + if _, err = c.readOK(); err != nil { + return err } } else { return errors.Errorf("invalid packet %x", data[0])