← 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 Taylor
  • Date: 2008-10-06 01:30:47 UTC
  • Revision ID: monty@inaugust.com-20081006013047-6m2ejc0c4peye2k9
Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.

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
 
  my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
 
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);
60
62
  if (flag)
61
63
  {
62
64
    if (share->kfile >= 0 &&
79
81
    }
80
82
    if (share->decode_trees)
81
83
    {
82
 
      my_free((uchar*) share->decode_trees,MYF(0));
83
 
      my_free((uchar*) share->decode_tables,MYF(0));
 
84
      free((uchar*) share->decode_trees);
 
85
      free((uchar*) share->decode_tables);
84
86
    }
85
87
    thr_lock_delete(&share->lock);
86
88
    pthread_mutex_destroy(&share->intern_lock);
92
94
        rwlock_destroy(&share->key_root_lock[i]);
93
95
      }
94
96
    }
95
 
    my_free((uchar*) info->s,MYF(0));
 
97
    free((uchar*) info->s);
96
98
  }
97
99
  pthread_mutex_unlock(&THR_LOCK_myisam);
98
100
 
99
101
  if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
100
102
    error = my_errno;
101
103
 
102
 
  my_free((uchar*) info,MYF(0));
 
104
  free((uchar*) info);
103
105
 
104
106
  if (error)
105
107
  {