Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport 592 #751

Merged
merged 5 commits into from
May 8, 2016
Merged

Backport 592 #751

merged 5 commits into from
May 8, 2016

Commits on May 7, 2016

  1. Use Thread.handle_interrupt to protect query 

    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.
    @tamird @sodabrew
    tamird authored and sodabrew committed May 7, 2016
    Configuration menu
    Copy the full SHA
    80eb5c9 View commit details
    Browse the repository at this point in the history

  2. client.c need not know about @query_options

    @tamird @sodabrew
    tamird authored and sodabrew committed May 7, 2016
    Configuration menu
    Copy the full SHA
    ec574ee View commit details
    Browse the repository at this point in the history

  3. Remove redundant local

    @tamird @sodabrew
    tamird authored and sodabrew committed May 7, 2016
    Configuration menu
    Copy the full SHA
    2652fdb View commit details
    Browse the repository at this point in the history

  4. Fix Timeout interrupt handling on Ruby 2.3 and protect Mysql2::Statem… 

    …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
    sodabrew committed May 7, 2016
    Configuration menu
    Copy the full SHA
    1846453 View commit details
    Browse the repository at this point in the history

  5. Add Ruby 2.3 to the Travis CI matrix

    @sodabrew
    sodabrew committed May 7, 2016
    Configuration menu
    Copy the full SHA
    94a8d8b View commit details
    Browse the repository at this point in the history