johannes Mon Sep 29 21:20:38 2008 UTC
Modified files:
/php-src/ext/pdo_mysql pdo_mysql.c
Log:
Free persistent cache and improve MINFO output
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.20&r2=1.21&diff_format=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.20
php-src/ext/pdo_mysql/pdo_mysql.c:1.21
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.20 Mon Jul 21 13:05:51 2008
+++ php-src/ext/pdo_mysql/pdo_mysql.c Mon Sep 29 21:20:36 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_mysql.c,v 1.20 2008/07/21 13:05:51 johannes Exp $ */
+/* $Id: pdo_mysql.c,v 1.21 2008/09/29 21:20:36 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -61,7 +61,7 @@
/* true global environment */
#ifdef PDO_USE_MYSQLND
-static MYSQLND_ZVAL_PCACHE *mysql_mysqlnd_zval_cache;
+static MYSQLND_ZVAL_PCACHE *pdo_mysqlnd_zval_cache;
#endif
@@ -84,7 +84,7 @@
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY",
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
#ifdef PDO_USE_MYSQLND
- mysql_mysqlnd_zval_cache =
mysqlnd_palloc_init_cache(PDO_MYSQL_G(cache_size));
+ pdo_mysqlnd_zval_cache =
mysqlnd_palloc_init_cache(PDO_MYSQL_G(cache_size));
#endif
return php_pdo_register_driver(&pdo_mysql_driver);
@@ -97,6 +97,7 @@
{
php_pdo_unregister_driver(&pdo_mysql_driver);
#if PDO_USE_MYSQLND
+ mysqlnd_palloc_free_cache(pdo_mysqlnd_zval_cache);
UNREGISTER_INI_ENTRIES();
#endif
@@ -109,23 +110,23 @@
static PHP_MINFO_FUNCTION(pdo_mysql)
{
php_info_print_table_start();
-#ifdef PDO_USE_MYSQLND
- php_info_print_table_header(2, "PDO Driver for MySQL, mysql native
driver version", mysql_get_client_info());
+ php_info_print_table_header(2, "PDO Driver for MySQL", "enabled");
+ php_info_print_table_row(2, "Client API version",
mysql_get_client_info());
+
+#ifdef PDO_USE_MYSQLND
{
zval values;
- php_info_print_table_header(2, "Persistent cache",
mysql_mysqlnd_zval_cache? "enabled":"disabled");
+ php_info_print_table_header(2, "Persistent cache",
pdo_mysqlnd_zval_cache ? "enabled":"disabled");
- if (mysql_mysqlnd_zval_cache) {
+ if (pdo_mysqlnd_zval_cache) {
/* Now report cache status */
- mysqlnd_palloc_stats(mysql_mysqlnd_zval_cache, &values);
+ mysqlnd_palloc_stats(pdo_mysqlnd_zval_cache, &values);
mysqlnd_minfo_print_hash(&values);
zval_dtor(&values);
}
}
-#else
- php_info_print_table_header(2, "PDO Driver for MySQL, client library
version", mysql_get_client_info());
#endif
php_info_print_table_end();
@@ -141,7 +142,7 @@
*/
static PHP_RINIT_FUNCTION(pdo_mysql)
{
- PDO_MYSQL_G(mysqlnd_thd_zval_cache) =
mysqlnd_palloc_rinit(mysql_mysqlnd_zval_cache);
+ PDO_MYSQL_G(mysqlnd_thd_zval_cache) =
mysqlnd_palloc_rinit(pdo_mysqlnd_zval_cache);
#if PDO_DBG_ENABLED
if (PDO_MYSQL_G(debug)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
