~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_create.c

  • Committer: Brian Aker
  • Date: 2008-07-02 21:31:48 UTC
  • mfrom: (28.1.41 libtool-patch)
  • Revision ID: brian@tangent.org-20080702213148-pc4f4hjt5c9qvp00
Merge from Monty Taylor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
192
192
      my_free((uchar*) share,MYF(0));
193
193
      goto err;
194
194
    }
195
 
#ifdef THREAD
196
195
    thr_lock_init(&share->lock);
197
196
    VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST));
198
 
#endif
199
197
    if (!create_info->internal_table)
200
198
    {
201
199
      share->open_list.data= (void*) share;
296
294
  if (share->open_list.data)                    /* If not internal table */
297
295
    heap_share_list= list_delete(heap_share_list, &share->open_list);
298
296
  hp_clear(share);                      /* Remove blocks from memory */
299
 
#ifdef THREAD
300
297
  thr_lock_delete(&share->lock);
301
298
  VOID(pthread_mutex_destroy(&share->intern_lock));
302
 
#endif
303
299
  my_free((uchar*) share->name, MYF(0));
304
300
  my_free((uchar*) share, MYF(0));
305
301
  return;