2 files changed, 21 insertions, 4 deletions
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php
index ded3ae27c6..f61f7cb755 100644
--- a/phpBB/db/mysql.php
+++ b/phpBB/db/mysql.php
@@ -305,10 +305,15 @@ class sql_db
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if ( $query_id )
 		{
-			$result = @mysql_free_result($query_id);
-			return $result;
+			unset($this->row[$query_id]);
+			unset($this->rowset[$query_id]);
+
+			@mysql_free_result($query_id);
+
+			return true;
 		}
 		else
 		{
diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php
index b40497b40e..a712265ff0 100644
--- a/phpBB/db/mysql4.php
+++ b/phpBB/db/mysql4.php
@@ -297,7 +297,19 @@ class sql_db
 			$query_id = $this->query_result;
 		}
 
-		return ( $query_id ) ? mysql_free_result($query_id) : false;
+		if ( $query_id )
+		{
+			unset($this->row[$query_id]);
+			unset($this->rowset[$query_id]);
+
+			mysql_free_result($query_id);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
 	}
 
 	function sql_error()