← 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-07 23:42:51 UTC
  • mto: This revision was merged to the branch mainline in revision 670.
  • Revision ID: monty@inaugust.com-20081207234251-yxtbg06jpylwej29
Finally removed all of the my_malloc stuff.

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);