Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 7e89434084d7952d107aef1c41f2019a73310634
https://github.com/django/django/commit/7e89434084d7952d107aef1c41f2019a73310634
Author: Aymeric Augustin <aymeric.augus...@m4x.org>
Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths:
M django/db/transaction.py
M tests/transactions/tests.py
Log Message:
-----------
[1.7.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL.
Thanks err for the report.
Backport of 58161e4e from master.
Commit: 5f22bda3827f32289793b90a387d8c77d602a859
https://github.com/django/django/commit/5f22bda3827f32289793b90a387d8c77d602a859
Author: Aymeric Augustin <aymeric.augus...@m4x.org>
Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths:
M django/db/backends/mysql/base.py
M django/db/backends/oracle/base.py
M django/db/backends/postgresql_psycopg2/base.py
M django/db/backends/sqlite3/base.py
Log Message:
-----------
[1.7.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit.
Refs #21202.
Backport of 3becac84 from master
Commit: 2e42c859da42a871244aca36162a0aad2b63c02b
https://github.com/django/django/commit/2e42c859da42a871244aca36162a0aad2b63c02b
Author: Aymeric Augustin <aymeric.augus...@m4x.org>
Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths:
M django/db/backends/__init__.py
M django/db/backends/postgresql_psycopg2/base.py
M django/db/transaction.py
M tests/transactions/tests.py
Log Message:
-----------
[1.7.x] Fixed #21239 -- Maintained atomicity when closing the connection.
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.
Backport of 25860096 from master.
Commit: 2ad0bc132a6f70a128d8e1fec689c6a474ddde89
https://github.com/django/django/commit/2ad0bc132a6f70a128d8e1fec689c6a474ddde89
Author: Aymeric Augustin <aymeric.augus...@m4x.org>
Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths:
M django/db/transaction.py
M tests/backends/tests.py
Log Message:
-----------
[1.7.x] Fixed #21202 -- Maintained atomicity when the server disconnects.
Thanks intgr for the report.
This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.
Also simplified a 'backends' test that was constrained by this problem.
Backport of 81761508 from master
Commit: 1bcc8eb0f64831b24c2769e033a10e530c8ed140
https://github.com/django/django/commit/1bcc8eb0f64831b24c2769e033a10e530c8ed140
Author: Aymeric Augustin <aymeric.augus...@m4x.org>
Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths:
M django/db/transaction.py
Log Message:
-----------
[1.7.x] Increased robustness of 58161e4e. Refs #22291.
Backport of ee837b9a from master
Compare: https://github.com/django/django/compare/ae78227de374...1bcc8eb0f648
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/django-updates/53470c10aa079_56ed82bd38428bd%40hookshot-fe1-cp1-prd.iad.github.net.mail.
For more options, visit https://groups.google.com/d/optout.
