Backport 592 #751
Merged
Backport 592 #751
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
When available, we prevent `Timeout.timeout` from corrupting connections using `Thread.handle_interrupt`. Fixes brianmario#542. Revert "Update specs for Ruby 2.1 Timeout behavior by specifying 'Timeout::Error' as the klass parameter." This reverts commit d0a5199.
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
force-pushed
the
backport_592
branch
2 times, most recently
from
c3efe67
to
01e3bd0
Compare
|
Thank you for taking care of this and cutting a new version of the gem. This is going to be a big help to me and many others. |
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.
Second pass at #731 with rebased commits from #592 and #679.