diff options
author | Andrew Dolgov <[email protected]> | 2013-08-02 16:20:39 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-08-02 16:20:39 +0400 |
commit | 38f439708cd78b224978c3d3d9cd85d40a9f9c04 (patch) | |
tree | c99ec40d3358f2bc9d7dc5e1426793ec659a4ad1 /classes/db/mysql.php | |
parent | edba269b6f3f2ed594c75f5ad9a6b3ecfeb3121f (diff) |
rollback current transaction before trying to report SQL query errors, properly save database error messages when logging query errors
Diffstat (limited to 'classes/db/mysql.php')
-rw-r--r-- | classes/db/mysql.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/classes/db/mysql.php b/classes/db/mysql.php index aab05aca2..d4b45b98c 100644 --- 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; |