diff --git a/src/code.cloudfoundry.org/go.mod b/src/code.cloudfoundry.org/go.mod index a2552299bd..51fca53dd8 100644 --- a/src/code.cloudfoundry.org/go.mod +++ b/src/code.cloudfoundry.org/go.mod @@ -57,7 +57,7 @@ require ( github.com/envoyproxy/go-control-plane v0.11.0 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 - github.com/go-sql-driver/mysql v1.7.0 + github.com/go-sql-driver/mysql v1.7.1 github.com/go-test/deep v1.1.0 github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v4 v4.5.0 diff --git a/src/code.cloudfoundry.org/go.sum b/src/code.cloudfoundry.org/go.sum index c8a202dd74..8451baca99 100644 --- a/src/code.cloudfoundry.org/go.sum +++ b/src/code.cloudfoundry.org/go.sum @@ -186,8 +186,9 @@ github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= +github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/AUTHORS b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/AUTHORS index 0513275195..fb1478c3bc 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/AUTHORS +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/AUTHORS @@ -78,11 +78,13 @@ Olivier Mengué oscarzhao Paul Bonser Peter Schultz +Phil Porada Rebecca Chin Reed Allman Richard Wilkes Robert Russell Runrioter Wung +Samantha Frank Santhosh Kumar Tekuri Sho Iizuka Sho Ikeda diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md index 77024a8201..5166e4adb5 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md @@ -1,3 +1,16 @@ +## Version 1.7.1 (2023-04-25) + +Changes: + + - bump actions/checkout@v3 and actions/setup-go@v3 (#1375) + - Add go1.20 and mariadb10.11 to the testing matrix (#1403) + - Increase default maxAllowedPacket size. (#1411) + +Bugfixes: + + - Use SET syntax as specified in the MySQL documentation (#1402) + + ## Version 1.7 (2022-11-29) Changes: diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/README.md b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/README.md index 25de2e5aa6..3b5d229aae 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/README.md +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/README.md @@ -282,10 +282,10 @@ Please keep in mind, that param values must be [url.QueryEscape](https://golang. ##### `maxAllowedPacket` ``` Type: decimal number -Default: 4194304 +Default: 64*1024*1024 ``` -Max packet size allowed in bytes. The default value is 4 MiB and should be adjusted to match the server settings. `maxAllowedPacket=0` can be used to automatically fetch the `max_allowed_packet` variable from server *on every connection*. +Max packet size allowed in bytes. The default value is 64 MiB and should be adjusted to match the server settings. `maxAllowedPacket=0` can be used to automatically fetch the `max_allowed_packet` variable from server *on every connection*. ##### `multiStatements` diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/connection.go b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/connection.go index 9539077cb1..947a883e30 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/connection.go +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/connection.go @@ -71,10 +71,10 @@ func (mc *mysqlConn) handleParams() (err error) { cmdSet.Grow(4 + len(param) + 1 + len(val) + 30*(len(mc.cfg.Params)-1)) cmdSet.WriteString("SET ") } else { - cmdSet.WriteByte(',') + cmdSet.WriteString(", ") } cmdSet.WriteString(param) - cmdSet.WriteByte('=') + cmdSet.WriteString(" = ") cmdSet.WriteString(val) } } diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/const.go b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/const.go index b1e6b85efc..64e2bced6f 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/const.go +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/const.go @@ -10,7 +10,7 @@ package mysql const ( defaultAuthPlugin = "mysql_native_password" - defaultMaxAllowedPacket = 4 << 20 // 4 MiB + defaultMaxAllowedPacket = 64 << 20 // 64 MiB. See https://github.com/go-sql-driver/mysql/issues/1355 minProtocolVersion = 10 maxPacketSize = 1<<24 - 1 timeFormat = "2006-01-02 15:04:05.999999" diff --git a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/errors.go b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/errors.go index 7c037e7d60..ff9a8f088c 100644 --- a/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/errors.go +++ b/src/code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/errors.go @@ -27,7 +27,7 @@ var ( ErrOldProtocol = errors.New("MySQL server does not support required protocol 41+") ErrPktSync = errors.New("commands out of sync. You can't run this command now") ErrPktSyncMul = errors.New("commands out of sync. Did you run multiple statements at once?") - ErrPktTooLarge = errors.New("packet for query is too large. Try adjusting the 'max_allowed_packet' variable on the server") + ErrPktTooLarge = errors.New("packet for query is too large. Try adjusting the `Config.MaxAllowedPacket`") ErrBusyBuffer = errors.New("busy buffer") // errBadConnNoWrite is used for connection errors where nothing was sent to the database yet. diff --git a/src/code.cloudfoundry.org/vendor/modules.txt b/src/code.cloudfoundry.org/vendor/modules.txt index c25fa7696c..813a48954d 100644 --- a/src/code.cloudfoundry.org/vendor/modules.txt +++ b/src/code.cloudfoundry.org/vendor/modules.txt @@ -327,7 +327,7 @@ github.com/ghodss/yaml ## explicit; go 1.16 github.com/go-logr/logr github.com/go-logr/logr/funcr -# github.com/go-sql-driver/mysql v1.7.0 +# github.com/go-sql-driver/mysql v1.7.1 ## explicit; go 1.13 github.com/go-sql-driver/mysql # github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572