Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL.

Thanks err for the report.

1 files changed, 7 insertions, 1 deletions

diff --git a/django/db/transaction.py b/django/db/transaction.py
index e78ed9b421..c769a4ba89 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -231,7 +231,13 @@ class Atomic(object):
                     if sid is None:
                         connection.needs_rollback = True
                     else:
-                        connection.savepoint_rollback(sid)
+                        try:
+                            connection.savepoint_rollback(sid)
+                        except DatabaseError:
+                            # If rolling back to a savepoint fails, mark for
+                            # rollback at a higher level and avoid shadowing
+                            # the original exception.
+                            connection.needs_rollback = True
                 else:
                     # Roll back transaction
                     connection.rollback()