diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 1da5ee2622..5e03e65b38 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -32,15 +32,14 @@ class sql_db
 	var $transaction = false;
 	var $sql_report = '';
 	var $sql_time = 0;
+	var $num_queries = 0;
+	var $open_querues = array();
 
 	//
 	// Constructor
 	//
 	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
-		$this->open_queries = array();
-		$this->num_queries = 0;
-
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->password = $sqlpassword;
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index 42df6a6494..1ab4a43383 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -32,13 +32,12 @@ class sql_db
 	var $transaction = false;
 	var $sql_report = '';
 	var $sql_time = 0;
+	var $num_queries = 0;
+	var $open_querues = array();
 
 	// Constructor
 	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
 	{
-		$this->open_queries = array();
-		$this->num_queries = 0;
-
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->password = $sqlpassword;
@@ -138,7 +137,7 @@ class sql_db
 					$curtime = $curtime[0] + $curtime[1] - $starttime;
 				}
 
-				if (!$this->query_result = @mysql_query($query, $this->db_connect_id))
+				if (!($this->query_result = @mysql_query($query, $this->db_connect_id)))
 				{
 					$this->sql_error($query);
 				}
@@ -210,7 +209,6 @@ class sql_db
 		if ($query != '')
 		{
 			$this->query_result = false;
-			$this->num_queries++;
 
 			$query .= ' LIMIT ' . ((!empty($offset)) ? $offset . ', ' . $total : $total);