andrey                                   Tue, 22 Sep 2009 14:52:12 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288576

Log:
sync with branch, after Ulf's commits

Changed paths:
    U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c

Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2009-09-22 14:44:11 UTC (rev 
288575)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2009-09-22 14:52:12 UTC (rev 
288576)
@@ -107,6 +107,8 @@
        php_info_print_table_row(2, "Command buffer size", buf);
        snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_read_buffer_size));
        php_info_print_table_row(2, "Read buffer size", buf);
+       snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_read_timeout));
+       php_info_print_table_row(2, "Read timeout", buf);
        php_info_print_table_row(2, "Collecting statistics", 
MYSQLND_G(collect_statistics)? "Yes":"No");
        php_info_print_table_row(2, "Collecting memory statistics", 
MYSQLND_G(collect_memory_statistics)? "Yes":"No");
        php_info_print_table_end();
@@ -150,7 +152,7 @@
        STD_PHP_INI_ENTRY("mysqlnd.debug",                                      
NULL,   PHP_INI_SYSTEM, OnUpdateString, debug, zend_mysqlnd_globals, 
mysqlnd_globals)
        STD_PHP_INI_ENTRY("mysqlnd.net_cmd_buffer_size",        "2048", 
PHP_INI_ALL,    OnUpdateLong,   net_cmd_buffer_size,    zend_mysqlnd_globals,   
        mysqlnd_globals)
        STD_PHP_INI_ENTRY("mysqlnd.net_read_buffer_size",       
"32768",PHP_INI_ALL,    OnUpdateLong,   net_read_buffer_size,   
zend_mysqlnd_globals,           mysqlnd_globals)
-       STD_PHP_INI_ENTRY("mysqlnd.net_read_timeout",           "31536000", 
PHP_INI_SYSTEM, OnUpdateLong, net_read_timeout, zend_mysqlnd_globals, 
mysqlnd_globals)
+       STD_PHP_INI_ENTRY("mysqlnd.net_read_timeout",   "31536000",     
PHP_INI_SYSTEM, OnUpdateLong,   net_read_timeout, zend_mysqlnd_globals, 
mysqlnd_globals)
        STD_PHP_INI_ENTRY("mysqlnd.log_mask",                           "0",    
PHP_INI_ALL,    OnUpdateLong,   log_mask, zend_mysqlnd_globals, mysqlnd_globals)
 PHP_INI_END()
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to