merge from trunk fix for undetected disconnects for mysql (ticket #625), r2793

diff --git a/CHANGES b/CHANGES
index b23c18d39f782a481c0cf9f7c7e21e623addff05..1e9386551d307cd2365ade447fd976218347143b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -117,6 +117,7 @@
       up ORM decision making [ticket:593]
     - added Interval type to types.py [ticket:595]
 - mysql
+    - fixed catching of some errors that imply a dropped connection [ticket:625]
     - fixed escaping of the modulo operator [ticket:624]
     - added 'fields' to reserved words [ticket:590]
 - oracle

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index cc304842ac41352c07e7072132e5d143a2d23a33..dfdebc5df4f573b55cef0cdea86684da00ef36c8 100644 (file)
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1039,7 +1039,7 @@ class MySQLDialect(ansisql.ANSIDialect):
             pass
 
     def is_disconnect(self, e):
-        return isinstance(e, self.dbapi.OperationalError) and e.args[0] in (2006, 2014)
+        return isinstance(e, self.dbapi.OperationalError) and e.args[0] in (2006, 2013, 2014, 2045, 2055)
 
     def get_default_schema_name(self):
         if not hasattr(self, '_default_schema_name'):