From 4267a4f631096ad14c14bf34ef01a11a7699305c Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 29 Jul 2008 23:29:26 +0000 Subject: [PATCH] Added patch from 'cavendish' releasing previous result resources in resultSet(). Closes #4801 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7374 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/model/datasources/dbo/dbo_mysql.php | 3 +++ cake/libs/model/datasources/dbo/dbo_mysqli.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index 02aad8be9..edef55065 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -427,6 +427,9 @@ class DboMysql extends DboSource { * @param unknown_type $results */ function resultSet(&$results) { + if (isset($this->results) && is_resource($this->results) && $this->results != $results) { + mysql_free_result($this->results); + } $this->results =& $results; $this->map = array(); $num_fields = mysql_num_fields($results); diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php index 1c86366fe..d8e9af0f0 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysqli.php +++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php @@ -405,6 +405,9 @@ class DboMysqli extends DboSource { * @param unknown_type $results */ function resultSet(&$results) { + if (isset($this->results) && is_resource($this->results) && $this->results != $results) { + mysqli_free_result($this->results); + } $this->results =& $results; $this->map = array(); $num_fields = mysqli_num_fields($results);