Remove a function that has no usage. The zval cache was disabled/removed

in 5.3.0-RC3.

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 0f9c9b6943322287e63ceb6df61541bcf1918c2a..12e717d105a94edba53dd966a1253bef075b051c 100644 (file)
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -91,7 +91,6 @@ const zend_function_entry mysqli_functions[] = {
        PHP_FE(mysqli_field_tell,                                                       NULL)
        PHP_FE(mysqli_free_result,                                                      NULL)
 #if defined(MYSQLI_USE_MYSQLND)
-       PHP_FE(mysqli_get_cache_stats,                                          NULL)
        PHP_FE(mysqli_get_connection_stats,                                     NULL)
        PHP_FE(mysqli_get_client_stats,                                         NULL)
 #endif

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index ad3e815a5cf92f435707f968ea4dc890bd465681..e50fda93d0cb8215f76ade8edc11e994f4ad7a7b 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -383,18 +383,6 @@ PHP_FUNCTION(mysqli_fetch_all)
 /* }}} */
 
 
-/* {{{ proto array mysqli_cache_stats(void) U
-   Returns statistics about the zval cache */
-PHP_FUNCTION(mysqli_get_cache_stats) 
-{
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
-       array_init(return_value);
-}
-/* }}} */
-
-
 /* {{{ proto array mysqli_get_client_stats(void)
    Returns statistics about the zval cache */
 PHP_FUNCTION(mysqli_get_client_stats) 

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 737641eace821298799a53cc3da52967d5c78f07..9c2433ec1b871a35be3060f6f856c445038e8bb2 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -391,7 +391,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
        long                    num_inactive_persistent;
        long                    max_persistent;
        long                    allow_persistent;
-       long                    cache_size;
        unsigned long   default_port;
        char                    *default_host;
        char                    *default_user;
@@ -456,7 +455,6 @@ PHP_FUNCTION(mysqli_field_count);
 PHP_FUNCTION(mysqli_field_seek);
 PHP_FUNCTION(mysqli_field_tell);
 PHP_FUNCTION(mysqli_free_result);
-PHP_FUNCTION(mysqli_get_cache_stats);
 PHP_FUNCTION(mysqli_get_client_stats);
 PHP_FUNCTION(mysqli_get_connection_stats);
 PHP_FUNCTION(mysqli_get_charset);

diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index 50c66d4f4d659e8b448d2b9571f7265e4a03247a..a68fb158123607d6af450530a594aa77e6726d4a 100644 (file)
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -59,7 +59,6 @@ require_once('skipifconnectfailure.inc');
        );
        if ($IS_MYSQLND) {
                // mysqlnd only
-               /* $expected_methods['get_cache_stats']         = true; */
                /* $expected_methods['get_client_stats']        = true; */
                $expected_methods['get_connection_stats']       = true;
                $expected_methods['poll']       = true;

diff --git a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt
deleted file mode 100644 (file)
index 4b0bab2..0000000
--- a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-mysqli_get_cache_stats() - disabled via php.ini
---INI--
-mysqlnd.collect_statistics="0"
-mysqlnd.collect_memory_statistics="0"
---SKIPIF--
-<?PHP
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
-if (!function_exists('mysqli_get_cache_stats')) {
-       die("skip only available with mysqlnd");
-}
-?>
---FILE--
-<?php
-       $before = mysqli_get_cache_stats();
-       if (!is_array($before) || empty($before)) {
-               printf("[001] Expecting non-empty array, got %s.\n", gettype($before));
-               var_dump($before);
-       }
-
-       require_once('table.inc');
-       if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
-               printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-       }
-       while ($row = mysqli_fetch_assoc($res))
-               ;
-       if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
-               printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-       }
-       while ($row = mysqli_fetch_assoc($res))
-               ;
-
-       $after = mysqli_get_cache_stats();
-       /* references has to be maintained - it is used for memory management */
-       $ignore = array('references' => true);
-       foreach ($before as $k => $v) {
-               if (isset($ignore[$k]))
-                       continue;
-
-               if ($before[$k] != $after[$k])
-                       printf("[004] Statistics have changed - %s: %s => %s\n", $
-                               $k, $before[$k], $after[$k]);
-       }
-
-       $ignore = array("size" => true, "free_items" => true, "references" => true);
-       foreach ($after as $k => $v) {
-               if ($v != 0 && !isset($ignore[$k])) {
-                       printf("[005] Field %s should not have any other value but 0, got %s.\n",
-                               $k, $v);
-               }
-       }
-
-       mysqli_close($link);
-
-       print "done!";
-?>
---CLEAN--
-<?php
-       require_once("clean_table.inc");
-?>
---EXPECTF--
-done!
\ No newline at end of file