From: Johannes Schlüter <johannes@php.net>
Date: Wed, 31 Aug 2011 11:11:08 +0000 (+0000)
Subject: - Fix Bug #55550 mysql.trace_mode miscounts result sets,
X-Git-Tag: php-5.4.0beta1~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d0e6cdb171c266032997ee2b45c2e1204e36dd4;p=php

- Fix Bug #55550 mysql.trace_mode miscounts result sets,
  fixes ext/mysql/tests/mysql_deprecated_api.phpt
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 8a0d5434cf..3f9a7d653a 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1590,6 +1590,7 @@ PHP_FUNCTION(mysql_list_dbs)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result");
 		RETURN_FALSE;
 	}
+	MySG(result_allocated)++;
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1627,6 +1628,7 @@ PHP_FUNCTION(mysql_list_tables)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result");
 		RETURN_FALSE;
 	}
+	MySG(result_allocated)++;
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1664,6 +1666,7 @@ PHP_FUNCTION(mysql_list_fields)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result");
 		RETURN_FALSE;
 	}
+	MySG(result_allocated)++;
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1696,6 +1699,7 @@ PHP_FUNCTION(mysql_list_processes)
 		RETURN_FALSE;
 	}
 
+	MySG(result_allocated)++;
 	ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */