From 36cd92f318862a6390c6c7df540c81ae8b5ad317 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Thu, 10 Aug 2006 06:32:25 +0000 Subject: [PATCH] fix mysql borkage --- lib/sqlalchemy/pool.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index 28a612edba..6b96d88ead 100644 --- 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 -- 2.47.2