Merge branch 'go-mysql-org:master' into master

Author: romberli

CHANGELOG.md

@@ -1,3 +1,7 @@
+### Tag v1.3.0 (2021.06.10)
+* Init Resultset in Result when handling ddl statement. [#578](https://github.com/go-mysql-org/go-mysql/pull/578) ([romberli](https://github.com/romberli))
+* Add pool for client connections. [#584](https://github.com/go-mysql-org/go-mysql/pull/584) ([atercattus](https://github.com/atercattus))
+
 ### Tag v1.2.1 (2021.05.27)
 * Prevent panic on malformed auth data. [#557](https://github.com/go-mysql-org/go-mysql/pull/557) ([timvaillancourt](https://github.com/timvaillancourt))
 

README.md

@@ -9,10 +9,10 @@ A pure go library to handle MySQL network protocol and replication.
 ## How to migrate to this repo
 To change the used package in your repo it's enough to add this `replace` directive to your `go.mod`:
 ```
-replace github.com/siddontang/go-mysql => github.com/go-mysql-org/go-mysql v1.2.1
+replace github.com/siddontang/go-mysql => github.com/go-mysql-org/go-mysql v1.3.0
 ```
 
-v1.2.1 - is the last tag in repo, feel free to choose what you want.
+v1.3.0 - is the last tag in repo, feel free to choose what you want.
 
 ## Changelog
 This repo uses [Changelog](CHANGELOG.md).

canal/canal.go

@@ -386,7 +386,7 @@ func (c *Canal) CheckBinlogRowImage(image string) error {
 	// need to check MySQL binlog row image? full, minimal or noblob?
 	// now only log
 	if c.cfg.Flavor == mysql.MySQLFlavor {
-		if res, err := c.Execute(`SHOW GLOBAL VARIABLES LIKE "binlog_row_image"`); err != nil {
+		if res, err := c.Execute(`SHOW GLOBAL VARIABLES LIKE 'binlog_row_image'`); err != nil {
 			return errors.Trace(err)
 		} else {
 			// MySQL has binlog row image from 5.6, so older will return empty
@@ -401,7 +401,7 @@ func (c *Canal) CheckBinlogRowImage(image string) error {
 }
 
 func (c *Canal) checkBinlogRowFormat() error {
-	res, err := c.Execute(`SHOW GLOBAL VARIABLES LIKE "binlog_format";`)
+	res, err := c.Execute(`SHOW GLOBAL VARIABLES LIKE 'binlog_format';`)
 	if err != nil {
 		return errors.Trace(err)
 	} else if f, _ := res.GetString(0, 1); f != "ROW" {

client/auth.go

@@ -140,9 +140,18 @@ func (c *Conn) writeAuthHandshake() error {
 	if !authPluginAllowed(c.authPluginName) {
 		return fmt.Errorf("unknow auth plugin name '%s'", c.authPluginName)
 	}
-	// Adjust client capability flags based on server support
+
+	// Set default client capabilities that reflect the abilities of this library
 	capability := CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION |
-		CLIENT_LONG_PASSWORD | CLIENT_TRANSACTIONS | CLIENT_PLUGIN_AUTH | c.capability&CLIENT_LONG_FLAG
+		CLIENT_LONG_PASSWORD | CLIENT_TRANSACTIONS | CLIENT_PLUGIN_AUTH
+	// Adjust client capability flags based on server support
+	capability |= c.capability & CLIENT_LONG_FLAG
+	// Adjust client capability flags on specific client requests
+	// Only flags that would make any sense setting and aren't handled elsewhere
+	// in the library are supported here
+	capability |= c.ccaps&CLIENT_FOUND_ROWS | c.ccaps&CLIENT_IGNORE_SPACE |
+		c.ccaps&CLIENT_MULTI_STATEMENTS | c.ccaps&CLIENT_MULTI_RESULTS |
+		c.ccaps&CLIENT_PS_MULTI_RESULTS | c.ccaps&CLIENT_CONNECT_ATTRS
 
 	// To enable TLS / SSL
 	if c.tlsConfig != nil {

client/client_test.go

@@ -94,6 +94,41 @@ func (s *clientTestSuite) TestConn_Ping(c *C) {
 	c.Assert(err, IsNil)
 }
 
+func (s *clientTestSuite) TestConn_SetCapability(c *C) {
+	caps := []uint32{
+		mysql.CLIENT_LONG_PASSWORD,
+		mysql.CLIENT_FOUND_ROWS,
+		mysql.CLIENT_LONG_FLAG,
+		mysql.CLIENT_CONNECT_WITH_DB,
+		mysql.CLIENT_NO_SCHEMA,
+		mysql.CLIENT_COMPRESS,
+		mysql.CLIENT_ODBC,
+		mysql.CLIENT_LOCAL_FILES,
+		mysql.CLIENT_IGNORE_SPACE,
+		mysql.CLIENT_PROTOCOL_41,
+		mysql.CLIENT_INTERACTIVE,
+		mysql.CLIENT_SSL,
+		mysql.CLIENT_IGNORE_SIGPIPE,
+		mysql.CLIENT_TRANSACTIONS,
+		mysql.CLIENT_RESERVED,
+		mysql.CLIENT_SECURE_CONNECTION,
+		mysql.CLIENT_MULTI_STATEMENTS,
+		mysql.CLIENT_MULTI_RESULTS,
+		mysql.CLIENT_PS_MULTI_RESULTS,
+		mysql.CLIENT_PLUGIN_AUTH,
+		mysql.CLIENT_CONNECT_ATTRS,
+		mysql.CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA,
+	}
+
+	for _, cap := range caps {
+		c.Assert(s.c.ccaps&cap > 0, IsFalse)
+		s.c.SetCapability(cap)
+		c.Assert(s.c.ccaps&cap > 0, IsTrue)
+		s.c.UnsetCapability(cap)
+		c.Assert(s.c.ccaps&cap > 0, IsFalse)
+	}
+}
+
 // NOTE for MySQL 5.5 and 5.6, server side has to config SSL to pass the TLS test, otherwise, it will throw error that
 //      MySQL server does not support TLS required by the client. However, for MySQL 5.7 and above, auto generated certificates
 //      are used by default so that manual config is no longer necessary.

client/conn.go

@@ -21,7 +21,10 @@ type Conn struct {
 	tlsConfig *tls.Config
 	proto     string
 
+	// server capabilities
 	capability uint32
+	// client-set capabilities only
+	ccaps uint32
 
 	status uint16
 
@@ -120,6 +123,16 @@ func (c *Conn) Ping() error {
 	return nil
 }
 
+// SetCapability enables the use of a specific capability
+func (c *Conn) SetCapability(cap uint32) {
+	c.ccaps |= cap
+}
+
+// UnsetCapability disables the use of a specific capability
+func (c *Conn) UnsetCapability(cap uint32) {
+	c.ccaps &= ^cap
+}
+
 // UseSSL: use default SSL
 // pass to options when connect
 func (c *Conn) UseSSL(insecureSkipVerify bool) {

client/pool.go

@@ -466,11 +466,12 @@ func (pool *Pool) startNewConnections(count int) {
 
 func (pool *Pool) ping(conn *Conn) error {
 	deadline := time.Now().Add(100 * time.Millisecond)
-	_ = conn.SetWriteDeadline(deadline)
-	_ = conn.SetReadDeadline(deadline)
+	_ = conn.SetDeadline(deadline)
 	err := conn.Ping()
 	if err != nil {
 		pool.logFunc(`Pool: ping query fail: %s`, err.Error())
+	} else {
+		_ = conn.SetDeadline(time.Time{})
 	}
 	return err
 }

client/resp.go

@@ -52,8 +52,8 @@ func (c *Conn) handleOKPacket(data []byte) (*Result, error) {
 		pos += 2
 
 		//todo:strict_mode, check warnings as error
-		//Warnings := binary.LittleEndian.Uint16(data[pos:])
-		//pos += 2
+		r.Warnings = binary.LittleEndian.Uint16(data[pos:])
+		pos += 2
 	} else if c.capability&CLIENT_TRANSACTIONS > 0 {
 		r.Status = binary.LittleEndian.Uint16(data[pos:])
 		c.status = r.Status
@@ -254,6 +254,7 @@ func (c *Conn) readResultStreaming(binary bool, result *Result, perRowCb SelectP
 		result.Status = okResult.Status
 		result.AffectedRows = okResult.AffectedRows
 		result.InsertId = okResult.InsertId
+		result.Warnings = okResult.Warnings
 		if result.Resultset == nil {
 			result.Resultset = NewResultset(0)
 		} else {
@@ -332,7 +333,7 @@ func (c *Conn) readResultColumns(result *Result) (err error) {
 		// EOF Packet
 		if c.isEOFPacket(data) {
 			if c.capability&CLIENT_PROTOCOL_41 > 0 {
-				//result.Warnings = binary.LittleEndian.Uint16(data[1:])
+				result.Warnings = binary.LittleEndian.Uint16(data[1:])
 				//todo add strict_mode, warning will be treat as error
 				result.Status = binary.LittleEndian.Uint16(data[3:])
 				c.status = result.Status
@@ -373,7 +374,7 @@ func (c *Conn) readResultRows(result *Result, isBinary bool) (err error) {
 		// EOF Packet
 		if c.isEOFPacket(data) {
 			if c.capability&CLIENT_PROTOCOL_41 > 0 {
-				//result.Warnings = binary.LittleEndian.Uint16(data[1:])
+				result.Warnings = binary.LittleEndian.Uint16(data[1:])
 				//todo add strict_mode, warning will be treat as error
 				result.Status = binary.LittleEndian.Uint16(data[3:])
 				c.status = result.Status
@@ -421,7 +422,7 @@ func (c *Conn) readResultRowsStreaming(result *Result, isBinary bool, perRowCb S
 		// EOF Packet
 		if c.isEOFPacket(data) {
 			if c.capability&CLIENT_PROTOCOL_41 > 0 {
-				// result.Warnings = binary.LittleEndian.Uint16(data[1:])
+				result.Warnings = binary.LittleEndian.Uint16(data[1:])
 				// todo add strict_mode, warning will be treat as error
 				result.Status = binary.LittleEndian.Uint16(data[3:])
 				c.status = result.Status

client/stmt.go

@@ -13,8 +13,9 @@ type Stmt struct {
 	conn *Conn
 	id   uint32
 
-	params  int
-	columns int
+	params   int
+	columns  int
+	warnings int
 }
 
 func (s *Stmt) ParamNum() int {
@@ -25,6 +26,10 @@ func (s *Stmt) ColumnNum() int {
 	return s.columns
 }
 
+func (s *Stmt) WarningsNum() int {
+	return s.warnings
+}
+
 func (s *Stmt) Execute(args ...interface{}) (*Result, error) {
 	if err := s.write(args...); err != nil {
 		return nil, errors.Trace(err)
@@ -196,7 +201,8 @@ func (c *Conn) Prepare(query string) (*Stmt, error) {
 	pos += 2
 
 	//warnings
-	//warnings = binary.LittleEndian.Uint16(data[pos:])
+	s.warnings = int(binary.LittleEndian.Uint16(data[pos:]))
+	pos += 2
 
 	if s.params > 0 {
 		if err := s.conn.readUntilEOF(); err != nil {

cmd/go-mysqlbinlog/main.go

@@ -9,9 +9,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/pingcap/errors"
+
 	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/go-mysql-org/go-mysql/replication"
-	"github.com/pingcap/errors"
 )
 
 var host = flag.String("host", "127.0.0.1", "MySQL host")
@@ -23,6 +24,7 @@ var flavor = flag.String("flavor", "mysql", "Flavor: mysql or mariadb")
 
 var file = flag.String("file", "", "Binlog filename")
 var pos = flag.Int("pos", 4, "Binlog position")
+var gtid = flag.String("gtid", "", "Binlog GTID set that this slave has executed")
 
 var semiSync = flag.Bool("semisync", false, "Support semi sync")
 var backupPath = flag.String("backup_path", "", "backup path to store binlog files")
@@ -56,10 +58,27 @@ func main() {
 			return
 		}
 	} else {
-		s, err := b.StartSync(pos)
-		if err != nil {
-			fmt.Printf("Start sync error: %v\n", errors.ErrorStack(err))
-			return
+		var (
+			s   *replication.BinlogStreamer
+			err error
+		)
+		if len(*gtid) > 0 {
+			gset, err := mysql.ParseGTIDSet(*flavor, *gtid)
+			if err != nil {
+				fmt.Printf("Failed to parse gtid %s with flavor %s, error: %v\n",
+					*gtid, *flavor, errors.ErrorStack(err))
+			}
+			s, err = b.StartSyncGTID(gset)
+			if err != nil {
+				fmt.Printf("Start sync by GTID error: %v\n", errors.ErrorStack(err))
+				return
+			}
+		} else {
+			s, err = b.StartSync(pos)
+			if err != nil {
+				fmt.Printf("Start sync error: %v\n", errors.ErrorStack(err))
+				return
+			}
 		}
 
 		for {