Fixing stats, updating test to accept new stats

diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index da1012ab487dffe8d8e2b28b334951f4e990559e..74c0cc800b196acd9d9b1e55f2dbebfbe3508853 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -887,7 +887,7 @@ if (!mysqli_query($link, "DROP SERVER IF EXISTS myself"))
 mysqli_close($link);
 ?>
 --EXPECTF--
-array(150) {
+array(152) {
   [%u|b%"bytes_sent"]=>
   %unicode|string%(1) "0"
   [%u|b%"bytes_received"]=>
@@ -974,6 +974,10 @@ array(150) {
   %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"]=>

diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index d65c8c1883030cb341563e706e7b562296bafc3e..ca3967e2155e56788efe9fda4c5c857b7c1f2e4c 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -79,7 +79,6 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] =
        { 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") },