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.

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

[5.1] Revert: Handle InnoDB Deadlocks By Re-Attempting Transactions #14930

Merged
merged 1 commit into from
Aug 22, 2016

Conversation

sbine
Copy link
Contributor

@sbine sbine commented Aug 22, 2016

This change attempted to reestablish the database connection when encountering a deadlock; per discussion on the previous thread we should revert this and instead reattempt the transaction.

@GrahamCampbell
Copy link
Member

Thanks. So, just to be clear, we want to merge this 5.1 -> 5.2, but when merging into 5.3, we leave it?

@GrahamCampbell
Copy link
Member

Just saw your other PR. Looks like we should be merging it all the way up. I get what you're doing now. :)

@taylorotwell taylorotwell merged commit 0b94001 into laravel:5.1 Aug 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants