← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_close.c

  • Committer: Monty
  • Date: 2008-10-02 14:34:18 UTC
  • Revision ID: mordred@scylla.inaugust.com-20081002143418-2mju17v3297i1h2p
Made including stdint.h work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_close.c
56
56
  myisam_open_list=list_delete(myisam_open_list,&info->open_list);
57
57
  pthread_mutex_unlock(&share->intern_lock);
58
58
 
59
 
  void * rec_buff_ptr= mi_get_rec_buff_ptr(info, info->rec_buff);
60
 
  if (rec_buff_ptr != NULL)
61
 
    free(rec_buff_ptr);
 
59
  my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
62
60
  if (flag)
63
61
  {
64
62
    if (share->kfile >= 0 &&
81
79
    }
82
80
    if (share->decode_trees)
83
81
    {
84
 
      free((unsigned char*) share->decode_trees);
85
 
      free((unsigned char*) share->decode_tables);
 
82
      my_free((uchar*) share->decode_trees,MYF(0));
 
83
      my_free((uchar*) share->decode_tables,MYF(0));
86
84
    }
87
85
    thr_lock_delete(&share->lock);
88
86
    pthread_mutex_destroy(&share->intern_lock);
94
92
        rwlock_destroy(&share->key_root_lock[i]);
95
93
      }
96
94
    }
97
 
    free((unsigned char*) info->s);
 
95
    my_free((uchar*) info->s,MYF(0));
98
96
  }
99
97
  pthread_mutex_unlock(&THR_LOCK_myisam);
100
98
 
101
99
  if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
102
100
    error = my_errno;
103
101
 
104
 
  free((unsigned char*) info);
 
102
  my_free((uchar*) info,MYF(0));
105
103
 
106
104
  if (error)
107
105
  {