rollback current transaction before trying to report SQL query errors, properly save...

[tt-rss.git] / classes / db / mysql.php

diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index aab05aca239a13b4c0ac26c25e7a342d25a758df..d4b45b98c6034516eefb27526d8c3dc71cb55109 100644 (file)
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -26,9 +26,12 @@ class Db_Mysql implements IDb {
        }
 
        function query($query, $die_on_error = true) {
-               $result = mysql_query($query, $this->link);
+               $result = @mysql_query($query, $this->link);
                if (!$result) {
-                       user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"),
+                       $error = @mysql_error($this->link);
+
+                       @mysql_query("ROLLBACK", $this->link);
+                       user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
                                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
                }
                return $result;