- Fix Bug #55550 mysql.trace_mode miscounts result sets,

  fixes ext/mysql/tests/mysql_deprecated_api.phpt

diff --git a/NEWS b/NEWS
index 44b0bb8b135b3cdb14b6f2ce13ed27b9980021f4..09d88dd7ff16140ce9f608457eb057c03aebc84d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Fixed bug #48476 (cloning extended DateTime class without calling
     parent::__constr crashed PHP). (Hannes)
 
+- MySQL:
+  . Fixed bug #55550 (mysql.trace_mode miscounts result sets). (Johannes)
+
 - Phar:
   . Fixed bug#52013 (Unable to decompress files in a compressed phar). (Hannes)
   . Fixed bug#53872 (internal corruption of phar). (Hannes)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 57de00f4e2ff39397fb8dd538e7a499dc8c020d5..86d1d568e1d265c38e13e8ea62a1ab67bece1954 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1588,6 +1588,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);
 }
 /* }}} */
@@ -1625,6 +1626,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);
 }
 /* }}} */
@@ -1662,6 +1664,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);
 }
 /* }}} */
@@ -1694,6 +1697,7 @@ PHP_FUNCTION(mysql_list_processes)
                RETURN_FALSE;
        }
 
+       MySG(result_allocated)++;
        ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */