~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 00:37:57 UTC
  • mfrom: (575.3.1 c++ize)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107003757-ahi7yycs9t23sima
MergedĀ fromĀ c++ize.

Show diffs side-by-side

added added

removed removed

Lines of Context:
260
260
  {
261
261
    if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data)
262
262
    {
263
 
      queue_remove(&alarm_queue,i),MYF(0);
 
263
      queue_remove(&alarm_queue,i);
264
264
      if (alarm_data->malloced)
265
265
        free((unsigned char*) alarm_data);
266
266
      found++;