uw Thu, 22 Oct 2009 16:05:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289855
Log:
Fixing stats, updating test to accept new stats
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
U php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt
2009-10-22 15:53:26 UTC (rev 289854)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt
2009-10-22 16:05:33 UTC (rev 289855)
@@ -887,7 +887,7 @@
mysqli_close($link);
?>
--EXPECTF--
-array(150) {
+array(152) {
[%u|b%"bytes_sent"]=>
%unicode|string%(1) "0"
[%u|b%"bytes_received"]=>
@@ -974,6 +974,10 @@
%unicode|string%(1) "0"
[%u|b%"rows_fetched_from_client_ps_cursor"]=>
%unicode|string%(1) "0"
+ [%u|b%"rows_affected_normal"]=>
+ %unicode|string%(1) "0"
+ [%u|b%"rows_affected_ps"]=>
+ %unicode|string%(1) "0"
[%u|b%"rows_skipped_normal"]=>
%unicode|string%(1) "0"
[%u|b%"rows_skipped_ps"]=>
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
2009-10-22 15:53:26 UTC (rev 289854)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
2009-10-22 16:05:33 UTC (rev 289855)
@@ -79,7 +79,6 @@
{ STR_W_LEN("rows_affected_normal") },
{ STR_W_LEN("rows_affected_ps") },
{ STR_W_LEN("rows_skipped_normal") },
- { STR_W_LEN("rows_skipped_normal") },
{ STR_W_LEN("rows_skipped_ps") },
{ STR_W_LEN("copy_on_write_saved") },
{ STR_W_LEN("copy_on_write_performed") },
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
2009-10-22 15:53:26 UTC (rev 289854)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
2009-10-22 16:05:33 UTC (rev 289855)
@@ -887,7 +887,7 @@
mysqli_close($link);
?>
--EXPECTF--
-array(150) {
+array(152) {
[%u|b%"bytes_sent"]=>
%unicode|string%(1) "0"
[%u|b%"bytes_received"]=>
@@ -974,6 +974,10 @@
%unicode|string%(1) "0"
[%u|b%"rows_fetched_from_client_ps_cursor"]=>
%unicode|string%(1) "0"
+ [%u|b%"rows_affected_normal"]=>
+ %unicode|string%(1) "0"
+ [%u|b%"rows_affected_ps"]=>
+ %unicode|string%(1) "0"
[%u|b%"rows_skipped_normal"]=>
%unicode|string%(1) "0"
[%u|b%"rows_skipped_ps"]=>
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2009-10-22 15:53:26 UTC
(rev 289854)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2009-10-22 16:05:33 UTC
(rev 289855)
@@ -79,7 +79,6 @@
{ STR_W_LEN("rows_affected_normal") },
{ STR_W_LEN("rows_affected_ps") },
{ STR_W_LEN("rows_skipped_normal") },
- { STR_W_LEN("rows_skipped_normal") },
{ STR_W_LEN("rows_skipped_ps") },
{ STR_W_LEN("copy_on_write_saved") },
{ STR_W_LEN("copy_on_write_performed") },
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
