From 99ea8068dfdd129bb2533a092511e6f8550db32b Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Fri, 12 Sep 2008 15:08:41 +0000 Subject: MFH: - More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL. --- ext/mysqlnd/mysqlnd_statistics.c | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_statistics.c') diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index eb8645b132..39a0c8dab0 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -30,6 +30,7 @@ /* {{{ mysqlnd_stats_values_names */ + const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { { STR_W_LEN("bytes_sent") }, @@ -38,6 +39,21 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { STR_W_LEN("packets_received") }, { STR_W_LEN("protocol_overhead_in") }, { STR_W_LEN("protocol_overhead_out") }, + { STR_W_LEN("bytes_received_ok_packet") }, + { STR_W_LEN("bytes_received_eof_packet") }, + { STR_W_LEN("bytes_received_rset_header_packet") }, + { STR_W_LEN("bytes_received_rset_field_meta_packet") }, + { STR_W_LEN("bytes_received_rset_row_packet") }, + { STR_W_LEN("bytes_received_prepare_response_packet") }, + { STR_W_LEN("bytes_received_change_user_packet") }, + { STR_W_LEN("packets_sent_command") }, + { STR_W_LEN("packets_received_ok") }, + { STR_W_LEN("packets_received_eof") }, + { STR_W_LEN("packets_received_rset_header") }, + { STR_W_LEN("packets_received_rset_field_meta") }, + { STR_W_LEN("packets_received_rset_row") }, + { STR_W_LEN("packets_received_prepare_response") }, + { STR_W_LEN("packets_received_change_user") }, { STR_W_LEN("result_set_queries") }, { STR_W_LEN("non_result_set_queries") }, { STR_W_LEN("no_index_used") }, @@ -93,7 +109,49 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { STR_W_LEN("mem_calloc_ammount") }, { STR_W_LEN("mem_realloc_calloc") }, { STR_W_LEN("mem_realloc_ammount") }, - { STR_W_LEN("mem_free_count") } + { STR_W_LEN("mem_free_count") }, + { STR_W_LEN("proto_text_fetched_null") }, + { STR_W_LEN("proto_text_fetched_bit") }, + { STR_W_LEN("proto_text_fetched_tinyint") }, + { STR_W_LEN("proto_text_fetched_short") }, + { STR_W_LEN("proto_text_fetched_int24") }, + { STR_W_LEN("proto_text_fetched_int") }, + { STR_W_LEN("proto_text_fetched_bigint") }, + { STR_W_LEN("proto_text_fetched_decimal") }, + { STR_W_LEN("proto_text_fetched_float") }, + { STR_W_LEN("proto_text_fetched_double") }, + { STR_W_LEN("proto_text_fetched_date") }, + { STR_W_LEN("proto_text_fetched_year") }, + { STR_W_LEN("proto_text_fetched_time") }, + { STR_W_LEN("proto_text_fetched_datetime") }, + { STR_W_LEN("proto_text_fetched_timestamp") }, + { STR_W_LEN("proto_text_fetched_string") }, + { STR_W_LEN("proto_text_fetched_blob") }, + { STR_W_LEN("proto_text_fetched_enum") }, + { STR_W_LEN("proto_text_fetched_set") }, + { STR_W_LEN("proto_text_fetched_geometry") }, + { STR_W_LEN("proto_text_fetched_other") }, + { STR_W_LEN("proto_binary_fetched_null") }, + { STR_W_LEN("proto_binary_fetched_bit") }, + { STR_W_LEN("proto_binary_fetched_tinyint") }, + { STR_W_LEN("proto_binary_fetched_short") }, + { STR_W_LEN("proto_binary_fetched_int24") }, + { STR_W_LEN("proto_binary_fetched_int") }, + { STR_W_LEN("proto_binary_fetched_bigint") }, + { STR_W_LEN("proto_binary_fetched_decimal") }, + { STR_W_LEN("proto_binary_fetched_float") }, + { STR_W_LEN("proto_binary_fetched_double") }, + { STR_W_LEN("proto_binary_fetched_date") }, + { STR_W_LEN("proto_binary_fetched_year") }, + { STR_W_LEN("proto_binary_fetched_time") }, + { STR_W_LEN("proto_binary_fetched_datetime") }, + { STR_W_LEN("proto_binary_fetched_timestamp") }, + { STR_W_LEN("proto_binary_fetched_string") }, + { STR_W_LEN("proto_binary_fetched_blob") }, + { STR_W_LEN("proto_binary_fetched_enum") }, + { STR_W_LEN("proto_binary_fetched_set") }, + { STR_W_LEN("proto_binary_fetched_geometry") }, + { STR_W_LEN("proto_binary_fetched_other") } }; /* }}} */ -- cgit v1.2.1