Merge branch 'master' into gtid_tagged_log_event_serialized

Author: dveeden

client/auth.go

@@ -15,7 +15,7 @@ import (
 const defaultAuthPluginName = mysql.AUTH_NATIVE_PASSWORD
 
 // defines the supported auth plugins
-var supportedAuthPlugins = []string{mysql.AUTH_NATIVE_PASSWORD, mysql.AUTH_SHA256_PASSWORD, mysql.AUTH_CACHING_SHA2_PASSWORD}
+var supportedAuthPlugins = []string{mysql.AUTH_NATIVE_PASSWORD, mysql.AUTH_SHA256_PASSWORD, mysql.AUTH_CACHING_SHA2_PASSWORD, mysql.AUTH_MARIADB_ED25519}
 
 // helper function to determine what auth methods are allowed by this client
 func authPluginAllowed(pluginName string) bool {
@@ -172,6 +172,15 @@ func (c *Conn) genAuthResponse(authData []byte) ([]byte, bool, error) {
 			// see: https://dev.mysql.com/doc/internals/en/public-key-retrieval.html
 			return []byte{1}, false, nil
 		}
+	case mysql.AUTH_MARIADB_ED25519:
+		if len(authData) != 32 {
+			return nil, false, mysql.ErrMalformPacket
+		}
+		res, err := mysql.CalcEd25519Password(authData, c.password)
+		if err != nil {
+			return nil, false, err
+		}
+		return res, false, nil
 	default:
 		// not reachable
 		return nil, false, fmt.Errorf("auth plugin '%s' is not supported", c.authPluginName)
@@ -195,7 +204,7 @@ func (c *Conn) genAttributes() []byte {
 // See: http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
 func (c *Conn) writeAuthHandshake() error {
 	if !authPluginAllowed(c.authPluginName) {
-		return fmt.Errorf("unknow auth plugin name '%s'", c.authPluginName)
+		return fmt.Errorf("unknown auth plugin name '%s'", c.authPluginName)
 	}
 
 	// Set default client capabilities that reflect the abilities of this library

client/conn.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"math/bits"
 	"net"
 	"runtime"
 	"runtime/debug"
@@ -381,6 +382,21 @@ func (c *Conn) Begin() error {
 	return errors.Trace(err)
 }
 
+func (c *Conn) BeginTx(readOnly bool, txIsolation string) error {
+	if txIsolation != "" {
+		if _, err := c.exec("SET TRANSACTION ISOLATION LEVEL " + txIsolation); err != nil {
+			return errors.Trace(err)
+		}
+	}
+	var err error
+	if readOnly {
+		_, err = c.exec("START TRANSACTION READ ONLY")
+	} else {
+		_, err = c.exec("START TRANSACTION")
+	}
+	return errors.Trace(err)
+}
+
 func (c *Conn) Commit() error {
 	_, err := c.exec("COMMIT")
 	return errors.Trace(err)
@@ -557,13 +573,10 @@ func (c *Conn) execSend(query string) error {
 // separated by "|". Examples of capability names are CLIENT_DEPRECATE_EOF and CLIENT_PROTOCOL_41.
 // These are defined as constants in the mysql package.
 func (c *Conn) CapabilityString() string {
-	var caps []string
 	capability := c.capability
-	for i := 0; capability != 0; i++ {
-		field := uint32(1 << i)
-		if capability&field == 0 {
-			continue
-		}
+	caps := make([]string, 0, bits.OnesCount32(capability))
+	for capability != 0 {
+		field := uint32(1 << bits.TrailingZeros32(capability))
 		capability ^= field
 
 		switch field {
@@ -642,13 +655,10 @@ func (c *Conn) CapabilityString() string {
 // StatusString returns a "|" separated list of status fields. Example status values are SERVER_QUERY_WAS_SLOW and SERVER_STATUS_AUTOCOMMIT.
 // These are defined as constants in the mysql package.
 func (c *Conn) StatusString() string {
-	var stats []string
 	status := c.status
-	for i := 0; status != 0; i++ {
-		field := uint16(1 << i)
-		if status&field == 0 {
-			continue
-		}
+	stats := make([]string, 0, bits.OnesCount16(status))
+	for status != 0 {
+		field := uint16(1 << bits.TrailingZeros16(status))
 		status ^= field
 
 		switch field {