diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/mysqlnd/mysqlnd_statistics.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index de8014ccea..c06557fb95 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -26,32 +26,32 @@ #include "mysqlnd_debug.h" -/* {{{ mysqlnd_stats_values_names +/* {{{ mysqlnd_stats_values_names */ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { { MYSQLND_STR_W_LEN("bytes_sent") }, - { MYSQLND_STR_W_LEN("bytes_received") }, + { MYSQLND_STR_W_LEN("bytes_received") }, { MYSQLND_STR_W_LEN("packets_sent") }, { MYSQLND_STR_W_LEN("packets_received") }, { MYSQLND_STR_W_LEN("protocol_overhead_in") }, { MYSQLND_STR_W_LEN("protocol_overhead_out") }, - { MYSQLND_STR_W_LEN("bytes_received_ok_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_eof_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_header_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_field_meta_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_row_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_prepare_response_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_change_user_packet") }, - { MYSQLND_STR_W_LEN("packets_sent_command") }, - { MYSQLND_STR_W_LEN("packets_received_ok") }, - { MYSQLND_STR_W_LEN("packets_received_eof") }, - { MYSQLND_STR_W_LEN("packets_received_rset_header") }, - { MYSQLND_STR_W_LEN("packets_received_rset_field_meta") }, - { MYSQLND_STR_W_LEN("packets_received_rset_row") }, - { MYSQLND_STR_W_LEN("packets_received_prepare_response") }, - { MYSQLND_STR_W_LEN("packets_received_change_user") }, + { MYSQLND_STR_W_LEN("bytes_received_ok_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_eof_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_header_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_field_meta_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_row_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_prepare_response_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_change_user_packet") }, + { MYSQLND_STR_W_LEN("packets_sent_command") }, + { MYSQLND_STR_W_LEN("packets_received_ok") }, + { MYSQLND_STR_W_LEN("packets_received_eof") }, + { MYSQLND_STR_W_LEN("packets_received_rset_header") }, + { MYSQLND_STR_W_LEN("packets_received_rset_field_meta") }, + { MYSQLND_STR_W_LEN("packets_received_rset_row") }, + { MYSQLND_STR_W_LEN("packets_received_prepare_response") }, + { MYSQLND_STR_W_LEN("packets_received_change_user") }, { MYSQLND_STR_W_LEN("result_set_queries") }, { MYSQLND_STR_W_LEN("non_result_set_queries") }, { MYSQLND_STR_W_LEN("no_index_used") }, |