Skip to content

4-2-backport: activerecord/mysql2: Avoid setting @connection to nil, just close it #26643

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
Merged
merged 1 commit into from
Jan 18, 2017
Merged

4-2-backport: activerecord/mysql2: Avoid setting @connection to nil, just close it #26643

merged 1 commit into from
Jan 18, 2017

Conversation

dylanahsmith
Copy link
Contributor

@rafaelfranca, @arthurnn please review
cc @sirupsen

Backport #26434 for the 4-2-stable branch

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @schneems (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@rails-bot
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against 4-2-stable. Please double check that you specified the right target!

@sirupsen
Copy link
Contributor

Yes please! Causing a lot of grief for us 👍

@arthurnn
Copy link
Member

arthurnn commented Jan 3, 2017

Seems like CI is broken. do you mind rebasing this, and I will give it a merge?

Thanks Dylan

@rafaelfranca rafaelfranca assigned arthurnn and unassigned schneems Jan 3, 2017
@dylanahsmith dylanahsmith force-pushed the 4-2-mysql2-no-nil-connection branch from b5b5421 to 12729dc Compare January 9, 2017 16:36
@dylanahsmith
activerecord/mysql2: Avoid setting @connection to nil, just close it
c6bf2b8 
Backport of rails#26434

Removed the error message check to fix test failures from mysql2 changing
its error message. This was also done on master.
@dylanahsmith dylanahsmith force-pushed the 4-2-mysql2-no-nil-connection branch from 4d8db92 to c6bf2b8 Compare January 9, 2017 18:29
@dylanahsmith
Copy link
Contributor Author

@arthurnn rebased and fixed CI in a similar way as #26869

@arthurnn arthurnn merged commit c6bf2b8 into rails:4-2-stable Jan 18, 2017
arthurnn added a commit that referenced this pull request Jan 18, 2017
@arthurnn
Merge PR #26643
c8ab708 
4-2-backport: activerecord/mysql2: Avoid setting @connection to nil, just close it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arthurnn arthurnn

Labels
activerecord MySQL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dylanahsmith @rails-bot @sirupsen @arthurnn @schneems @maclover7