PHP mysqlnd svn commit: r679 - in trunk: php4/ext/mysql php5/ext/mysql php6/ext/mysql

[ahristov]

Author: ahristov
Date: 2007-07-09 17:12:41 +0200 (Mon, 09 Jul 2007)
New Revision: 679

Modified:
   trunk/php4/ext/mysql/php_mysql.c
   trunk/php5/ext/mysql/php_mysql.c
   trunk/php6/ext/mysql/php_mysql.c
Log:
Fix for phpinfo failing test


Modified: trunk/php4/ext/mysql/php_mysql.c
===================================================================
--- trunk/php4/ext/mysql/php_mysql.c	2007-07-09 14:42:37 UTC (rev 678)
+++ trunk/php4/ext/mysql/php_mysql.c	2007-07-09 15:12:41 UTC (rev 679)
@@ -566,7 +566,21 @@
 	php_info_print_table_row(2, "MYSQL_INCLUDE", PHP_MYSQL_INCLUDE);
 	php_info_print_table_row(2, "MYSQL_LIBS", PHP_MYSQL_LIBS);
 #endif
+#if defined(HAVE_MYSQLND)
+	{
+		zval values;
 
+		php_info_print_table_header(2, "Persistent cache", mysql_mysqlnd_zval_cache?
"enabled":"disabled");
+		
+		if (mysql_mysqlnd_zval_cache) {
+			/* Now report cache status */
+			mysqlnd_palloc_stats(mysql_mysqlnd_zval_cache, &values);
+			mysqlnd_minfo_print_hash(&values);
+			zval_dtor(&values);
+		}
+	}
+#endif
+
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();

Modified: trunk/php5/ext/mysql/php_mysql.c
===================================================================
--- trunk/php5/ext/mysql/php_mysql.c	2007-07-09 14:42:37 UTC (rev 678)
+++ trunk/php5/ext/mysql/php_mysql.c	2007-07-09 15:12:41 UTC (rev 679)
@@ -559,7 +559,21 @@
 	php_info_print_table_row(2, "MYSQL_INCLUDE", PHP_MYSQL_INCLUDE);
 	php_info_print_table_row(2, "MYSQL_LIBS", PHP_MYSQL_LIBS);
 #endif
+#if defined(HAVE_MYSQLND)
+	{
+		zval values;
 
+		php_info_print_table_header(2, "Persistent cache", mysql_mysqlnd_zval_cache?
"enabled":"disabled");
+		
+		if (mysql_mysqlnd_zval_cache) {
+			/* Now report cache status */
+			mysqlnd_palloc_stats(mysql_mysqlnd_zval_cache, &values);
+			mysqlnd_minfo_print_hash(&values);
+			zval_dtor(&values);
+		}
+	}
+#endif
+
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();

Modified: trunk/php6/ext/mysql/php_mysql.c
===================================================================
--- trunk/php6/ext/mysql/php_mysql.c	2007-07-09 14:42:37 UTC (rev 678)
+++ trunk/php6/ext/mysql/php_mysql.c	2007-07-09 15:12:41 UTC (rev 679)
@@ -555,7 +555,20 @@
 	php_info_print_table_row(2, "MYSQL_INCLUDE", PHP_MYSQL_INCLUDE);
 	php_info_print_table_row(2, "MYSQL_LIBS", PHP_MYSQL_LIBS);
 #endif
+#if defined(HAVE_MYSQLND)
+	{
+		zval values;
 
+		php_info_print_table_header(2, "Persistent cache", mysql_mysqlnd_zval_cache?
"enabled":"disabled");
+		
+		if (mysql_mysqlnd_zval_cache) {
+			/* Now report cache status */
+			mysqlnd_palloc_stats(mysql_mysqlnd_zval_cache, &values);
+			mysqlnd_minfo_print_hash(&values);
+			zval_dtor(&values);
+		}
+	}
+#endif
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();