← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.cc

  • Committer: Monty Taylor
  • Date: 2008-12-18 20:31:21 UTC
  • mto: This revision was merged to the branch mainline in revision 716.
  • Revision ID: monty@inaugust.com-20081218203121-2y9x2iy2bzc0qw51
Fixed a time_t thing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.cc
352
352
    else
353
353
    {
354
354
      time_t now= time(NULL);
355
 
      uint32_t next= now+10-(now%10);
356
 
      while ((alarm_data=(ALARM*) queue_top(&alarm_queue))->expire_time <= now)
 
355
      time_t next= now+10-(now%10);
 
356
      while ((alarm_data= (ALARM*) queue_top(&alarm_queue))->expire_time <= now)
357
357
      {
358
358
        alarm_data->alarmed=1;                  /* Info to thread */
359
359
        if (pthread_equal(alarm_data->thread,alarm_thread) ||
372
372
#ifndef USE_ALARM_THREAD
373
373
      if (alarm_queue.elements)
374
374
      {
375
 
        alarm((uint) (alarm_data->expire_time-now));
 
375
        alarm((uint32_t) (alarm_data->expire_time-now));
376
376
        next_alarm_expire_time= alarm_data->expire_time;
377
377
      }
378
378
#endif