← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.cc

  • Committer: Brian Aker
  • Date: 2008-12-09 17:33:02 UTC
  • mfrom: (656.1.54 devel)
  • Revision ID: brian@tangent.org-20081209173302-aptngvc7efxnatnt
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.cc
198
198
  reschedule= (uint32_t) next_alarm_expire_time > (uint32_t) now + sec;
199
199
  if (!alarm_data)
200
200
  {
201
 
    if (!(alarm_data=(ALARM*) my_malloc(sizeof(ALARM),MYF(MY_WME))))
 
201
    if (!(alarm_data=(ALARM*) malloc(sizeof(ALARM))))
202
202
    {
203
203
      *alrm= 0;                                 /* No alarm */
204
204
      pthread_mutex_unlock(&LOCK_alarm);