merge.

checkpoint.
does not compile.

1 files changed, 3 insertions, 2 deletions

diff --git a/include/thr_alarm.h b/include/thr_alarm.h
index 8d7f5bcdee0..2ff975607cd 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -34,7 +34,7 @@ extern "C" {
 
 typedef struct st_alarm_info
 {
-  ulong next_alarm_time;
+  time_t next_alarm_time;
   uint active_alarms;
   uint max_used_alarms;
 } ALARM_INFO;
@@ -78,10 +78,11 @@ typedef int thr_alarm_entry;
 typedef thr_alarm_entry* thr_alarm_t;
 
 typedef struct st_alarm {
-  ulong expire_time;
+  time_t expire_time;
   thr_alarm_entry alarmed;		/* set when alarm is due */
   pthread_t thread;
   my_thread_id thread_id;
+  uint index_in_queue;
   my_bool malloced;
 } ALARM;