Merge branch 'master' into read_optimization

Author: methane

.github/workflows/test.yml

@@ -29,10 +29,10 @@ jobs:
           import os
           go = [
               # Keep the most recent production release at the top
-              '1.23',
+              '1.24',
               # Older production releases
+              '1.23',
               '1.22',
-              '1.21',
           ]
           mysql = [
               '9.0',

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.9.2 (2025-04-07)
+
+v1.9.2 is a re-release of v1.9.1 due to a release process issue; no changes were made to the content.
+
+
 ## v1.9.1 (2025-03-21)
 
 ### Major Changes

README.md

@@ -42,7 +42,7 @@ A MySQL-Driver for Go's [database/sql](https://golang.org/pkg/database/sql/) pac
 
 ## Requirements
 
-* Go 1.21 or higher. We aim to support the 3 latest versions of Go.
+* Go 1.22 or higher. We aim to support the 3 latest versions of Go.
 * MySQL (5.7+) and MariaDB (10.5+) are supported.
 * [TiDB](https://github.com/pingcap/tidb) is supported by PingCAP.
   * Do not ask questions about TiDB in our issue tracker or forum.

benchmark_test.go

@@ -93,7 +93,7 @@ func benchmarkQueryHelper(b *testing.B, compr bool) {
 	defer wg.Wait()
 	b.StartTimer()
 
-	for i := 0; i < concurrencyLevel; i++ {
+	for range concurrencyLevel {
 		go func() {
 			for {
 				if atomic.AddInt64(&remain, -1) < 0 {
@@ -171,7 +171,7 @@ func BenchmarkExec(b *testing.B) {
 	defer wg.Wait()
 	b.StartTimer()
 
-	for i := 0; i < concurrencyLevel; i++ {
+	for range concurrencyLevel {
 		go func() {
 			for {
 				if atomic.AddInt64(&remain, -1) < 0 {
@@ -386,7 +386,7 @@ func BenchmarkQueryRawBytes(b *testing.B) {
 	for i := range blob {
 		blob[i] = 42
 	}
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		_, err := db.Exec("INSERT INTO bench_rawbytes VALUES (?, ?)", i, blob)
 		if err != nil {
 			b.Fatal(err)
@@ -442,7 +442,7 @@ func BenchmarkReceiveMassiveRows(b *testing.B) {
 	}
 	for i := 0; i < 10000; i += 100 {
 		args := make([]any, 200)
-		for j := 0; j < 100; j++ {
+		for j := range 100 {
 			args[j*2] = i + j
 			args[j*2+1] = sval
 		}

connection_test.go

@@ -146,7 +146,7 @@ func TestCleanCancel(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
 
-	for i := 0; i < 3; i++ { // Repeat same behavior
+	for range 3 { // Repeat same behavior
 		err := mc.Ping(ctx)
 		if err != context.Canceled {
 			t.Errorf("expected context.Canceled, got %#v", err)

driver_test.go

@@ -26,6 +26,7 @@ import (
 	"os"
 	"reflect"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -1609,68 +1610,32 @@ func TestCollation(t *testing.T) {
 		t.Skipf("MySQL server not running on %s", netAddr)
 	}
 
-	defaultCollation := "utf8mb4_general_ci"
+	// MariaDB may override collation specified by handshake with `character_set_collations` variable.
+	// https://mariadb.com/kb/en/setting-character-sets-and-collations/#changing-default-collation
+	// https://mariadb.com/kb/en/server-system-variables/#character_set_collations
+	// utf8mb4_general_ci, utf8mb3_general_ci will be overridden by default MariaDB.
+	// Collations other than charasets default are not overridden. So utf8mb4_unicode_ci is safe.
 	testCollations := []string{
-		"",               // do not set
-		defaultCollation, // driver default
 		"latin1_general_ci",
 		"binary",
 		"utf8mb4_unicode_ci",
 		"cp1257_bin",
 	}
 
 	for _, collation := range testCollations {
-		var expected, tdsn string
-		if collation != "" {
-			tdsn = dsn + "&collation=" + collation
-			expected = collation
-		} else {
-			tdsn = dsn
-			expected = defaultCollation
-		}
-
-		runTests(t, tdsn, func(dbt *DBTest) {
-			// see https://mariadb.com/kb/en/setting-character-sets-and-collations/#changing-default-collation
-			// when character_set_collations is set for the charset, it overrides the default collation
-			// so we need to check if the default collation is overridden
-			forceExpected := expected
-			var defaultCollations string
-			err := dbt.db.QueryRow("SELECT @@character_set_collations").Scan(&defaultCollations)
-			if err == nil {
-				// Query succeeded, need to check if we should override expected collation
-				collationMap := make(map[string]string)
-				pairs := strings.Split(defaultCollations, ",")
-				for _, pair := range pairs {
-					parts := strings.Split(pair, "=")
-					if len(parts) == 2 {
-						collationMap[parts[0]] = parts[1]
-					}
-				}
+		t.Run(collation, func(t *testing.T) {
+			tdsn := dsn + "&collation=" + collation
+			expected := collation
 
-				// Get charset prefix from expected collation
-				parts := strings.Split(expected, "_")
-				if len(parts) > 0 {
-					charset := parts[0]
-					if newCollation, ok := collationMap[charset]; ok {
-						forceExpected = newCollation
-					}
+			runTests(t, tdsn, func(dbt *DBTest) {
+				var got string
+				if err := dbt.db.QueryRow("SELECT @@collation_connection").Scan(&got); err != nil {
+					dbt.Fatal(err)
 				}
-			}
-
-			var got string
-			if err := dbt.db.QueryRow("SELECT @@collation_connection").Scan(&got); err != nil {
-				dbt.Fatal(err)
-			}
-
-			if got != expected {
-				if forceExpected != expected {
-					if got != forceExpected {
-						dbt.Fatalf("expected forced connection collation %s but got %s", forceExpected, got)
-					}
-				} else {
+				if got != expected {
 					dbt.Fatalf("expected connection collation %s but got %s", expected, got)
 				}
-			}
+			})
 		})
 	}
 }
@@ -1959,7 +1924,7 @@ func TestPreparedManyCols(t *testing.T) {
 		rows.Close()
 
 		// Create 0byte string which we can't send via STMT_LONG_DATA.
-		for i := 0; i < numParams; i++ {
+		for i := range numParams {
 			params[i] = ""
 		}
 		rows, err = stmt.Query(params...)
@@ -2004,7 +1969,7 @@ func TestConcurrent(t *testing.T) {
 			})
 		}
 
-		for i := 0; i < max; i++ {
+		for i := range max {
 			go func(id int) {
 				defer wg.Done()
 
@@ -2388,7 +2353,7 @@ func TestPing(t *testing.T) {
 			q.Close()
 
 			// Verify that Ping() clears both fields.
-			for i := 0; i < 2; i++ {
+			for range 2 {
 				if err := c.Ping(ctx); err != nil {
 					dbt.fail("Pinger", "Ping", err)
 				}
@@ -2591,7 +2556,7 @@ func TestMultiResultSet(t *testing.T) {
 			}
 			defer stmt.Close()
 
-			for j := 0; j < 2; j++ {
+			for j := range 2 {
 				rows, err := stmt.Query()
 				if err != nil {
 					dbt.Fatalf("%v (i=%d) (j=%d)", err, i, j)
@@ -2698,7 +2663,7 @@ func TestQueryMultipleResults(t *testing.T) {
 			c := conn.(*mysqlConn)
 
 			// Demonstrate that repeated queries reset the affectedRows
-			for i := 0; i < 2; i++ {
+			for range 2 {
 				_, err := qr.Query(`
 				INSERT INTO test (value) VALUES ('a'), ('b');
 				INSERT INTO test (value) VALUES ('c'), ('d'), ('e');
@@ -3326,11 +3291,11 @@ func TestRawBytesAreNotModified(t *testing.T) {
 
 	runTests(t, dsn, func(dbt *DBTest) {
 		dbt.mustExec("CREATE TABLE test (id int, value BLOB) CHARACTER SET utf8")
-		for i := 0; i < insertRows; i++ {
+		for i := range insertRows {
 			dbt.mustExec("INSERT INTO test VALUES (?, ?)", i+1, sqlBlobs[i&1])
 		}
 
-		for i := 0; i < contextRaceIterations; i++ {
+		for i := range contextRaceIterations {
 			func() {
 				ctx, cancel := context.WithCancel(context.Background())
 				defer cancel()
@@ -3594,8 +3559,8 @@ func TestConnectionAttributes(t *testing.T) {
 		rowsMap[attrName] = attrValue
 	}
 
-	connAttrs := append(append([]string{}, defaultAttrs...), customAttrs...)
-	expectedAttrValues := append(append([]string{}, defaultAttrValues...), customAttrValues...)
+	connAttrs := slices.Concat(defaultAttrs, customAttrs)
+	expectedAttrValues := slices.Concat(defaultAttrValues, customAttrValues)
 	for i := range connAttrs {
 		if gotValue := rowsMap[connAttrs[i]]; gotValue != expectedAttrValues[i] {
 			dbt.Errorf("expected %q, got %q", expectedAttrValues[i], gotValue)
@@ -3679,7 +3644,7 @@ func TestIssue1567(t *testing.T) {
 			count = max
 		}
 
-		for i := 0; i < count; i++ {
+		for range count {
 			timeout := time.Duration(mrand.Int63n(int64(rtt)))
 			ctx, cancel := context.WithTimeout(context.Background(), timeout)
 			dbt.db.PingContext(ctx)

dsn.go

@@ -414,7 +414,7 @@ func ParseDSN(dsn string) (cfg *Config, err error) {
 					if dsn[j] == '@' {
 						// username[:password]
 						// Find the first ':' in dsn[:j]
-						for k = 0; k < j; k++ {
+						for k = 0; k < j; k++ { // We cannot use k = range j here, because we use dsn[:k] below
 							if dsn[k] == ':' {
 								cfg.Passwd = dsn[k+1 : j]
 								break

go.mod

@@ -1,5 +1,5 @@
 module github.com/go-sql-driver/mysql
 
-go 1.21.0
+go 1.22.0
 
 require filippo.io/edwards25519 v1.1.0

infile.go

@@ -95,10 +95,7 @@ const defaultPacketSize = 16 * 1024 // 16KB is small enough for disk readahead a
 
 func (mc *okHandler) handleInFileRequest(name string) (err error) {
 	var rdr io.Reader
-	packetSize := defaultPacketSize
-	if mc.maxWriteSize < packetSize {
-		packetSize = mc.maxWriteSize
-	}
+	packetSize := min(mc.maxWriteSize, defaultPacketSize)
 
 	if idx := strings.Index(name, "Reader::"); idx == 0 || (idx > 0 && name[idx-1] == '/') { // io.Reader
 		// The server might return an an absolute path. See issue #355.

packets.go

@@ -980,10 +980,7 @@ func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
 	mc := stmt.mc
 
 	// Determine threshold dynamically to avoid packet size shortage.
-	longDataSize := mc.maxAllowedPacket / (stmt.paramCount + 1)
-	if longDataSize < 64 {
-		longDataSize = 64
-	}
+	longDataSize := max(mc.maxAllowedPacket/(stmt.paramCount+1), 64)
 
 	// Reset packet-sequence
 	mc.resetSequence()

result.go

@@ -8,6 +8,8 @@
 
 package mysql
 
+import "slices"
+
 import "database/sql/driver"
 
 // Result exposes data not available through *connection.Result.
@@ -42,9 +44,9 @@ func (res *mysqlResult) RowsAffected() (int64, error) {
 }
 
 func (res *mysqlResult) AllLastInsertIds() []int64 {
-	return append([]int64{}, res.insertIds...) // defensive copy
+	return slices.Clone(res.insertIds) // defensive copy
 }
 
 func (res *mysqlResult) AllRowsAffected() []int64 {
-	return append([]int64{}, res.affectedRows...) // defensive copy
+	return slices.Clone(res.affectedRows) // defensive copy
 }

utils.go

@@ -182,7 +182,7 @@ func parseDateTime(b []byte, loc *time.Location) (time.Time, error) {
 
 func parseByteYear(b []byte) (int, error) {
 	year, n := 0, 1000
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		v, err := bToi(b[i])
 		if err != nil {
 			return 0, err
@@ -207,7 +207,7 @@ func parseByte2Digits(b1, b2 byte) (int, error) {
 
 func parseByteNanoSec(b []byte) (int, error) {
 	ns, digit := 0, 100000 // max is 6-digits
-	for i := 0; i < len(b); i++ {
+	for i := range b {
 		v, err := bToi(b[i])
 		if err != nil {
 			return 0, err
@@ -678,7 +678,7 @@ func escapeStringBackslash(buf []byte, v string) []byte {
 	pos := len(buf)
 	buf = reserveBuffer(buf, len(v)*2)
 
-	for i := 0; i < len(v); i++ {
+	for i := range len(v) {
 		c := v[i]
 		switch c {
 		case '\x00':
@@ -746,7 +746,7 @@ func escapeStringQuotes(buf []byte, v string) []byte {
 	pos := len(buf)
 	buf = reserveBuffer(buf, len(v)*2)
 
-	for i := 0; i < len(v); i++ {
+	for i := range len(v) {
 		c := v[i]
 		if c == '\'' {
 			buf[pos+1] = '\''