summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r--mysys/thr_alarm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 6697b9d3360..add5335a7af 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -402,6 +402,8 @@ void end_thr_alarm(void)
void thr_alarm_kill(pthread_t thread_id)
{
uint i;
+ if (alarm_aborted)
+ return;
pthread_mutex_lock(&LOCK_alarm);
for (i=0 ; i < alarm_queue.elements ; i++)
{