Remove the zval caching from mysqlnd. It was disabled versions ago

due to problems on windows, which were not debugged. Better have 
code that is disabled not in the core.

3 files changed, 3 insertions, 34 deletions

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 47e2a9e53f..4c9c6bf41d 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -74,7 +74,6 @@ zend_class_entry *mysqli_warning_class_entry;
 zend_class_entry *mysqli_exception_class_entry;
 
 #ifdef MYSQLI_USE_MYSQLND
-MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache;
 MYSQLND_QCACHE		*mysqli_mysqlnd_qcache;
 #endif
 
@@ -589,9 +588,6 @@ PHP_INI_BEGIN()
 #endif
 	STD_PHP_INI_BOOLEAN("mysqli.reconnect",				"0",	PHP_INI_SYSTEM,		OnUpdateLong,		reconnect,			zend_mysqli_globals,		mysqli_globals)
 	STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile",	"1",	PHP_INI_SYSTEM,		OnUpdateLong,		allow_local_infile,	zend_mysqli_globals,		mysqli_globals)
-#ifdef MYSQLI_USE_MYSQLND
-	STD_PHP_INI_ENTRY("mysqli.cache_size",				"2000",	PHP_INI_SYSTEM,		OnUpdateLong,		cache_size,			zend_mysqli_globals,		mysqli_globals)
-#endif
 PHP_INI_END()
 /* }}} */
 
@@ -620,10 +616,6 @@ static PHP_GINIT_FUNCTION(mysqli)
 #else
 	mysqli_globals->embedded = 0;
 #endif
-#ifdef MYSQLI_USE_MYSQLND
-	mysqli_globals->cache_size = 0;
-	mysqli_globals->mysqlnd_thd_zval_cache = NULL;
-#endif
 }
 /* }}} */
 
@@ -642,7 +634,6 @@ PHP_MINIT_FUNCTION(mysqli)
 	}
 #endif
 #else
-	mysqli_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MyG(cache_size));
 	mysqli_mysqlnd_qcache = mysqlnd_qcache_init_cache();
 #endif
 
@@ -882,7 +873,6 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
 #endif
 #endif
 #else
-	mysqlnd_palloc_free_cache(mysqli_mysqlnd_zval_cache);
 	mysqlnd_qcache_free_cache_reference(&mysqli_mysqlnd_qcache);
 #endif
 
@@ -909,9 +899,6 @@ PHP_RINIT_FUNCTION(mysqli)
 #endif
 	MyG(error_msg) = NULL;
 	MyG(error_no) = 0;
-#ifdef MYSQLI_USE_MYSQLND
-	MyG(mysqlnd_thd_zval_cache) = mysqlnd_palloc_rinit(mysqli_mysqlnd_zval_cache);
-#endif
 
 	return SUCCESS;
 }
@@ -951,7 +938,6 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
 	}
 #ifdef MYSQLI_USE_MYSQLND
 	zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysqli_persistent_helper_once TSRMLS_CC);
-	mysqlnd_palloc_rshutdown(MyG(mysqlnd_thd_zval_cache));
 #endif
 	return SUCCESS;
 }
@@ -976,19 +962,6 @@ PHP_MINFO_FUNCTION(mysqli)
 #if !defined(MYSQLI_USE_MYSQLND)
 	php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION);
 	php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
-#else
-	{
-		zval values;
-
-		php_info_print_table_header(2, "Persistent cache", mysqli_mysqlnd_zval_cache? "enabled":"disabled");
-		
-		if (mysqli_mysqlnd_zval_cache) {
-			/* Now report cache status */
-			mysqlnd_palloc_stats(mysqli_mysqlnd_zval_cache, &values);
-			mysqlnd_minfo_print_hash(&values);
-			zval_dtor(&values);
-		}
-	}
 #endif
 	php_info_print_table_end();
 
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 34fd353e95..4040c09591 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -175,7 +175,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 							if (!mysql_ping(mysql->mysql)) {
 #endif
 #ifdef MYSQLI_USE_MYSQLND
-								mysqlnd_restart_psession(mysql->mysql, MyG(mysqlnd_thd_zval_cache));
+								mysqlnd_restart_psession(mysql->mysql);
 #endif
 								MyG(num_active_persistent)++;
 								goto end;
@@ -232,7 +232,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
 #else
 	if (mysqlnd_connect(mysql->mysql, hostname, username, passwd, passwd_len, dbname, dbname_len,
-						port, socket, flags, MyG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL)
+						port, socket, flags TSRMLS_CC) == NULL)
 #endif
 	{
 		/* Save error messages - for mysqli_connect_error() & mysqli_connect_errno() */
@@ -416,7 +416,7 @@ PHP_FUNCTION(mysqli_get_cache_stats)
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
-	mysqlnd_palloc_stats(mysqli_mysqlnd_zval_cache, return_value);
+	array_init(return_value);
 }
 /* }}} */
 
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index aa57ad06a7..e9d76b0289 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -197,7 +197,6 @@ extern zend_property_info mysqli_driver_property_info_entries[];
 extern zend_property_info mysqli_warning_property_info_entries[];
 
 #ifdef MYSQLI_USE_MYSQLND
-extern MYSQLND_ZVAL_PCACHE	*mysqli_mysqlnd_zval_cache;
 extern MYSQLND_QCACHE		*mysqli_mysqlnd_qcache;
 #endif
 
@@ -367,9 +366,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
 	HashTable		*report_ht;
 	unsigned long	multi_query;
 	unsigned long	embedded;
-#ifdef MYSQLI_USE_MYSQLND
-	MYSQLND_THD_ZVAL_PCACHE	*mysqlnd_thd_zval_cache;
-#endif
 ZEND_END_MODULE_GLOBALS(mysqli)