From 977cea1438dafcdc98756b070a1383e5887d64c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 26 Apr 2016 20:04:24 +0300
Subject: actually check for failures properly in the dbupdater

---
 classes/db/mysql.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'classes/db/mysql.php')

diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index d4b45b98c..e8701f7bb 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -1,6 +1,7 @@
 <?php
 class Db_Mysql implements IDb {
 	private $link;
+	private $last_error;
 
 	function connect($host, $user, $pass, $db, $port) {
 		$this->link = mysql_connect($host, $user, $pass);
@@ -28,10 +29,10 @@ class Db_Mysql implements IDb {
 	function query($query, $die_on_error = true) {
 		$result = @mysql_query($query, $this->link);
 		if (!$result) {
-			$error = @mysql_error($this->link);
+			$this->last_error = @mysql_error($this->link);
 
 			@mysql_query("ROLLBACK", $this->link);
-			user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
+			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;
@@ -62,6 +63,10 @@ class Db_Mysql implements IDb {
 		return mysql_error();
 	}
 
+	function last_query_error() {
+		return $this->last_error;
+	}
+
 	function init() {
 		$this->query("SET time_zone = '+0:0'");
 
-- 
cgit v1.2.3-54-g00ecf