Skip to content

Commit 3263fb0

Browse files
author
Daniel McCarney
authored
deps: downgrade go-sql-driver to v1.4.1 (letsencrypt#4630)
In 0804e97 we updated `github.com/go-sql-driver/mysql` to a pinned commit (b4242bab7dc5) newer than the latest tagged release (v1.4.1) to avoid needing to pull in an extra dep. that was removed since v1.4.1. Unfortunately for reasons that are not perfectly clear updating `github.com/google/certificate-transparency-go` is preferring v1.4.1 over the pseudo-version made from the commit newer than v1.4.1 that we previously pinned. Since there is movement on making a v1.5.0 go-sql-driver mysql release tag and we can likely get ct-go to use that we'll temporarily accept this downgrade to update ct-go. Unit tests are confirmed to pass: ``` ~/go/src/github.com/go-sql-driver/mysql$ git log --pretty=format:'%h' -n 1 72cd26f ~/go/src/github.com/go-sql-driver/mysql$ go test ./... ok github.com/go-sql-driver/mysql 0.081s ```
1 parent 77a9330 commit 3263fb0

33 files changed

+1116
-1076
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/cloudflare/cfssl v1.4.0
99
github.com/eggsampler/acme/v3 v3.0.0
1010
github.com/go-gorp/gorp v2.0.0+incompatible // indirect
11-
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5
11+
github.com/go-sql-driver/mysql v1.4.1
1212
github.com/gogo/googleapis v1.1.0 // indirect
1313
github.com/gogo/protobuf v1.2.0 // indirect
1414
github.com/golang/mock v1.3.1

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ github.com/go-sql-driver/mysql v1.3.0 h1:pgwjLi/dvffoP9aabwkT3AKpXQM93QARkjFhDDq
5959
github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
6060
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5 h1:TPdJVmaDpKVlxYKc2CTaU6iY51jeQqbRooWdI1ATYG4=
6161
github.com/go-sql-driver/mysql v1.4.1-0.20191114115753-b4242bab7dc5/go.mod h1:XIaZU7xtUgusUqDPXOOPcmC5Dyyw3F1pbh54fHzaehk=
62+
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
63+
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
6264
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
6365
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
6466
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -258,6 +260,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
258260
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
259261
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
260262
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
263+
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
261264
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
262265
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
263266
google.golang.org/genproto v0.0.0-20190415143225-d1146b9035b9 h1:SymueV2ZwWqdojv3IQn27haYaNer4MttGly0aZCMpoc=

vendor/github.com/go-sql-driver/mysql/.travis.yml

Lines changed: 2 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/AUTHORS

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/CONTRIBUTING.md

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/README.md

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/conncheck_dummy.go renamed to vendor/github.com/go-sql-driver/mysql/appengine.go

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-sql-driver/mysql/auth.go

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)