diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 11:34:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 11:34:30 +0200 |
| commit | 866ccc8890a3932e260e43fa5fc7ab8170e6cc3d (patch) | |
| tree | 33a95867072308d4973d3a812bcc088dcbf55a64 /mysys/thr_alarm.c | |
| parent | 159a6c2e608d04732cb678c7691345b9b1dc69b1 (diff) | |
| parent | 1b5f0cbd465f92ffc278a924e765e41413d97420 (diff) | |
| download | mariadb-git-866ccc8890a3932e260e43fa5fc7ab8170e6cc3d.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index a101c23be58..97656e6b77f 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -274,7 +274,7 @@ void thr_end_alarm(thr_alarm_t *alarmed) /* Come here when some alarm in queue is due. Mark all alarms with are finnished in list. - Shedule alarms to be sent again after 1-10 sec (many alarms at once) + Schedule alarms to be sent again after 1-10 sec (many alarms at once) If alarm_aborted is set then all alarms are given and resent every second. */ @@ -426,7 +426,7 @@ void end_thr_alarm(my_bool free_structures) if (alarm_aborted != 1) /* If memory not freed */ { mysql_mutex_lock(&LOCK_alarm); - DBUG_PRINT("info",("Resheduling %d waiting alarms",alarm_queue.elements)); + DBUG_PRINT("info",("Rescheduling %d waiting alarms",alarm_queue.elements)); alarm_aborted= -1; /* mark aborted */ if (alarm_queue.elements || (alarm_thread_running && free_structures)) { |