fix mysql borkage

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 28a612edbaf987d5fc589d89081f323a8d106c6f..6b96d88ead5db61e1e2db9b67d42c3c67c615660 100644 (file)
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -169,7 +169,11 @@ class ConnectionFairy(object):
         if self.connection is not None:
             if self.pool.echo:
                 self.pool.log("Connection %s being returned to pool" % repr(self.connection))
-            self.connection.rollback()
+            try:
+                self.connection.rollback()
+            except:
+                # damn mysql -- (todo look for NotSupportedError)
+                pass
             self.pool.return_conn(self)
             self.pool = None
             self.connection = None