[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
andrey Thu, 28 Oct 2010 14:07:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304974 Log: show tracing Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-10-28 13:46:54 UTC (rev 304973) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-10-28 14:07:36 UTC (rev 304974) @@ -122,6 +122,8 @@ 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_row(2, Tracing, MYSQLND_G(debug)? MYSQLND_G(debug):n/a); php_info_print_table_end(); /* Print client stats */ Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-28 13:46:54 UTC (rev 304973) +++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-28 14:07:36 UTC (rev 304974) @@ -122,6 +122,8 @@ 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_row(2, Tracing, MYSQLND_G(debug)? MYSQLND_G(debug):n/a); php_info_print_table_end(); /* Print client stats */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
uw Mon, 04 Oct 2010 10:58:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=303980
Log:
Fixing compiler warning.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-10-04
10:51:44 UTC (rev 303979)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-10-04
10:58:05 UTC (rev 303980)
@@ -136,7 +136,7 @@
/* }}} */
-PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd)
/* {{{ PHP_GINIT_FUNCTION
Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-04 10:51:44 UTC (rev
303979)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-04 10:58:05 UTC (rev
303980)
@@ -136,7 +136,7 @@
/* }}} */
-PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd)
/* {{{ PHP_GINIT_FUNCTION
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
Hi Kalle! Thanks for pointing out the warnings! Am 04.10.2010 13:30, Kalle Sommer Nielsen schrieb: 2010/10/4 Ulf Wendel u...@php.net: uw Mon, 04 Oct 2010 10:58:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=303980 Log: Fixing compiler warning. After todays commits, the following new warnings appear on Windows, and before we had none: ext\mysqli\mysqli.c(898) : warning C4067: unexpected tokens following preprocess or directive - expected a newline Weird how whitespace changes have trigged this warning. I'm puzzled. If you check my commit, you should find that I have not touched that code: http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c?r1=303897r2=303973 http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/mysqli.c?r1=303897r2=303973 I'll apply the fix you proposed in a private mail - thanks! ext\mysqli\mysqli.c(1091) : warning C4101: 'i' : unreferenced local variable ext\mysqli\mysqli.c(1090) : warning C4101: 'row' : unreferenced local variable ext\mysqli\mysqli.c(1092) : warning C4101: 'fields' : unreferenced local variable ext\mysqli\mysqli.c(1093) : warning C4101: 'field_len' : unreferenced local variable I don't understand that one and I'm not getting it (with VS2008 on Win32). Allow me to say again that I believe not to have touched that code. It makes me feel a bit better. Of course the warning itself is not welcome... ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' Sorry, I don't get that one. These are all compiled using php-trunk r303980. Since all the mysql extensions are in sync, I'm sure they appear on PHP_5_3 aswell. Yes, they are almost in sync. Also, while you are at it, would you mind killing the ones in mysqlnd aswell? MySQLnd - oh, that's Andrey's baby :-). I'll check what we can do about the warnings and what other Windows compiler have to say... Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
Hi Ulf 2010/10/4 Ulf Wendel u...@php.net: uw Mon, 04 Oct 2010 10:58:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=303980 Log: Fixing compiler warning. After todays commits, the following new warnings appear on Windows, and before we had none: ext\mysqli\mysqli.c(898) : warning C4067: unexpected tokens following preprocess or directive - expected a newline ext\mysqli\mysqli.c(1091) : warning C4101: 'i' : unreferenced local variable ext\mysqli\mysqli.c(1090) : warning C4101: 'row' : unreferenced local variable ext\mysqli\mysqli.c(1092) : warning C4101: 'fields' : unreferenced local variable ext\mysqli\mysqli.c(1093) : warning C4101: 'field_len' : unreferenced local variable ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(156) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(156) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(157) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(157) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(158) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(158) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(159) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(159) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(160) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(160) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(161) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_driver.c(161) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(181) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(198) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(253) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(298) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(309) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(310) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqli\mysqli_prop.c(341) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(341) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(342) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(342) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(343) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(343) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(344) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(344) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(345) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(345) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(346) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(346) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(347) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(347) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(348) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(348) : warning C4047: 'initializing' : 'int' differs in levels of indirection from 'void *' ext\mysqli\mysqli_prop.c(349) :
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
andrey Thu, 10 Jun 2010 12:24:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=300352
Log:
export mysqlnd_globals_id, per Johannes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-06-10
12:11:19 UTC (rev 300351)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-06-10
12:24:03 UTC (rev 300352)
@@ -136,7 +136,7 @@
/* }}} */
-ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
/* {{{ PHP_GINIT_FUNCTION
Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-06-10 12:11:19 UTC (rev
300351)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-06-10 12:24:03 UTC (rev
300352)
@@ -136,7 +136,7 @@
/* }}} */
-ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
/* {{{ PHP_GINIT_FUNCTION
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
andrey Thu, 22 Apr 2010 15:14:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=298324 Log: adding what last commit was missing Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-04-22 15:07:40 UTC (rev 298323) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-04-22 15:14:45 UTC (rev 298324) @@ -151,6 +151,7 @@ mysqlnd_globals-net_read_buffer_size = 32768; mysqlnd_globals-net_read_timeout = 31536000; mysqlnd_globals-log_mask = 0; + mysqlnd_globals-log_mask = 16000; } /* }}} */ Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-04-22 15:07:40 UTC (rev 298323) +++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-04-22 15:14:45 UTC (rev 298324) @@ -151,6 +151,7 @@ mysqlnd_globals-net_read_buffer_size = 32768; mysqlnd_globals-net_read_timeout = 31536000; mysqlnd_globals-log_mask = 0; + mysqlnd_globals-log_mask = 16000; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c
andrey Thu, 22 Apr 2010 16:22:56 + Revision: http://svn.php.net/viewvc?view=revisionrevision=298335 Log: Fix problem spotted by Felipe. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-04-22 16:20:08 UTC (rev 298334) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2010-04-22 16:22:56 UTC (rev 298335) @@ -151,7 +151,7 @@ mysqlnd_globals-net_read_buffer_size = 32768; mysqlnd_globals-net_read_timeout = 31536000; mysqlnd_globals-log_mask = 0; - mysqlnd_globals-log_mask = 16000; + mysqlnd_globals-mempool_default_size = 16000; } /* }}} */ Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c === --- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-04-22 16:20:08 UTC (rev 298334) +++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-04-22 16:22:56 UTC (rev 298335) @@ -151,7 +151,7 @@ mysqlnd_globals-net_read_buffer_size = 32768; mysqlnd_globals-net_read_timeout = 31536000; mysqlnd_globals-log_mask = 0; - mysqlnd_globals-log_mask = 16000; + mysqlnd_globals-mempool_default_size = 16000; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
