Ticket #4802: mysql_safe_close-r4937.diff

trac/db/mysql_backend.py

@@ -161 +161 @@
                                   host=host, port=port, use_unicode=True)
             self._set_character_set(cnx, 'utf8')
         ConnectionWrapper.__init__(self, cnx)
+        self._is_closed = False
 
     def cast(self, column, type):
         if type == 'int':
@@ -180 +181 @@
         return self.cnx.insert_id()
 
     def rollback(self):
-        self.cnx.rollback()
-        self.cnx.ping()
+        if self.cnx.ping():
+            self.cnx.rollback()
+        else:
+            self._is_closed = True
+
+    def close(self):
+        if not self._is_closed:
+            self.cnx.close()
+            self._is_closed = True