From a1a58d6c5a9799cd3746d5bef85a9347051ef356 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Jun 2003 21:42:29 +0300 Subject: Don't install signal handler for SIGINT by default Added option --gdb Free memory used by replicate_xxx and binglog_xxx options mysql-test/mysql-test-run.sh: Added --gdb when using gdb mysys/thr_alarm.c: Safety check sql/mysql_priv.h: Don't install signal handler for SIGINT by default sql/mysqld.cc: Don't install signal handler for SIGINT by default Added option --gdb Free memory used by replicate_xxx and binglog_xxx options. Add statistics variable for killed threads sql/repl_failsafe.cc: Incremented aborted_connects on failure sql/sql_list.cc: Added free_list() to free memory on shutdown. --- mysys/thr_alarm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mysys') diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 7a845e3eb00..2a16eeec215 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -220,8 +220,7 @@ void thr_end_alarm(thr_alarm_t *alarmed) { ALARM *alarm_data; sigset_t old_mask; - uint i; - my_bool found=0; + uint i, found=0; DBUG_ENTER("thr_end_alarm"); pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask); @@ -235,11 +234,13 @@ void thr_end_alarm(thr_alarm_t *alarmed) queue_remove(&alarm_queue,i),MYF(0); if (alarm_data->malloced) my_free((gptr) alarm_data,MYF(0)); - found=1; + found++; +#ifndef DBUG_OFF break; +#endif } } - DBUG_ASSERT(!*alarmed || found); + DBUG_ASSERT(!*alarmed || found == 1); if (!found) { if (*alarmed) -- cgit v1.2.1