diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-10 21:42:29 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-10 21:42:29 +0300 |
| commit | a1a58d6c5a9799cd3746d5bef85a9347051ef356 (patch) | |
| tree | 89c6a444e8711ecb504294a64b81e9f3f2e6371f /mysys | |
| parent | c126f4fa4440c24b11e1261a360248962c81bf41 (diff) | |
| download | mariadb-git-a1a58d6c5a9799cd3746d5bef85a9347051ef356.tar.gz | |
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.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_alarm.c | 9 |
1 files changed, 5 insertions, 4 deletions
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) |