summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-05 12:29:13 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-05 12:29:13 +0300
commitcd7148472a6ed55acb64fd12068729096b29bd26 (patch)
treed938b5da0ff603d0b355b772263eee8066fd8cbe /sql/net_serv.cc
parent080f3bd21dcffea0cf386d8e4599afa740628b3b (diff)
downloadmariadb-git-cd7148472a6ed55acb64fd12068729096b29bd26.tar.gz
Print error if we can't delete an alarm
More debugging variables Increment aborted_threads in case of killed or too big packet include/thr_alarm.h: made prototype more portable mysys/thr_alarm.c: Print error if we can't delete an alarm sql/mysqld.cc: Statistics variable (for debugging) sql/net_serv.cc: statistics variable (for debugging) sql/sql_parse.cc: Increment aborted_threads in case of killed or too big packet
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 3d5055b4f24..a3bb2525f9d 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -65,11 +65,13 @@ void sql_print_error(const char *format,...);
#define USE_QUERY_CACHE
extern uint test_flags;
extern void query_cache_insert(NET *net, const char *packet, ulong length);
-extern ulong bytes_sent, bytes_received;
+extern ulong bytes_sent, bytes_received, net_big_packet_count;
extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
#else
#undef statistic_add
+#undef statistic_increment
#define statistic_add(A,B,C)
+#define statistic_increment(A,B)
#endif
#define TEST_BLOCKING 8
@@ -557,6 +559,9 @@ static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed,
DBUG_ENTER("my_net_skip_rest");
DBUG_PRINT("enter",("bytes_to_skip: %u", (uint) remain));
+ /* The following is good for debugging */
+ statistic_increment(net_big_packet_count,&LOCK_bytes_received);
+
if (!thr_alarm_in_use(alarmed))
{
my_bool old_mode;