summaryrefslogtreecommitdiff
path: root/ext/mysqli
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-04 16:06:24 -0700
committerStanislav Malyshev <stas@php.net>2013-08-04 16:06:24 -0700
commitc793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch)
treeba42379833bfa8176f468bfb23d24cd8ec3019e1 /ext/mysqli
parent3626db6142eda230586357a707b6cb4a0887e971 (diff)
parent8d86597d7368460383a33a4399ea7a8b244cd6fa (diff)
downloadphp-git-c793a6569013f9ab46f2cd7331cc1a04aa42cbed.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
Diffstat (limited to 'ext/mysqli')
-rw-r--r--ext/mysqli/tests/mysqli_get_client_stats.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index ef5ef6ee69..a22fc58f53 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -166,7 +166,7 @@ mysqlnd.collect_memory_statistics=1
mysqli_get_client_stats_assert_gt('bytes_sent', $info, $expected, $test_counter);
mysqli_get_client_stats_assert_gt('bytes_received', $info, $expected, $test_counter);
- // real_data_* get incremeneted after mysqli_*fetch*()
+ // real_data_* get incremented after mysqli_*fetch*()
mysqli_get_client_stats_assert_eq('bytes_received_real_data_normal', $info, "0", $test_counter);
mysqli_get_client_stats_assert_eq('bytes_received_real_data_ps', $info, "0", $test_counter);