MySQL fork driver update #47159
Merged
MySQL fork driver update #47159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greedy52
added
the
no-changelog
greedy52
commented
Oct 3, 2024
| } | ||
| endpoint := fmt.Sprintf("%s:%d", info.address, info.port) | ||
| conn, err := mysqlclient.Connect(endpoint, info.username, info.password, dbName, opt) | ||
| require.NoError(t, err) | ||
| t.Cleanup(func() { | ||
| _ = conn.Close() | ||
| _ = conn.Quit() |
There was a problem hiding this comment.
Our old patch sends COM_QUIT in conn.Close. Now the driver provides a Quit function that does a similar thing so switching to Quit where I can.
greedy52
commented
Oct 3, 2024
| @@ -464,17 +464,18 @@ func connectAsRDSMySQLAdmin(t *testing.T, ctx context.Context, instanceID string | |||
| const dbName = "mysql" | |||
| info := getRDSAdminInfo(t, ctx, instanceID) | |||
|
|
|||
| opt := func(conn *mysqlclient.Conn) { | |||
| opt := func(conn *mysqlclient.Conn) error { | |||
There was a problem hiding this comment.
driver now requires the option to return an error
greedy52
commented
Oct 3, 2024
| @@ -108,6 +108,11 @@ func (c *clientConn) maxRoleLength() int { | |||
| return mysqlMaxUsernameLength | |||
| } | |||
|
|
|||
| // Close calls conn.Quit to send COM_QUIT then close the conn. | |||
| func (c *clientConn) Close() error { | |||
| return trace.Wrap(c.Conn.Quit()) | |||
There was a problem hiding this comment.
clientConn will use Conn.Quit instead of Conn.Close. clientConn will be used for testing as well.
github-actions
bot
added
database-access
gabrielcorado
approved these changes
Oct 3, 2024
Tener
approved these changes
Oct 4, 2024
hugoShaka
approved these changes
Oct 4, 2024
public-teleport-github-review-bot
bot
removed request for
bernardjkim and
GavinFrazar
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #43544
Fork branch: https://github.com/gravitational/go-mysql/tree/v1.9.1-teleport.2
Fork release: https://github.com/gravitational/go-mysql/releases/tag/v1.9.1-teleport.2
Dropped a few Teleport patches in the fork.