← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Eric Lambert
  • Date: 2009-06-16 01:36:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1069.
  • Revision ID: eric.d.lambert@gmail.com-20090616013601-puy8xj5wv8lrxkha
-removed my_realpath from my_symlink and replaced it with calls to posix realpath

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
68
68
  uint32_t i,j,len,errpos,head_length,base_pos,offset,info_length,keys,
69
69
    key_parts,unique_key_parts,fulltext_keys,uniques;
70
70
  char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN],
71
 
       data_name[FN_REFLEN];
 
71
       data_name[FN_REFLEN], rp_buff[PATH_MAX];
72
72
  unsigned char *disk_cache= NULL;
73
73
  unsigned char *disk_pos, *end_pos;
74
74
  MI_INFO info,*m_info,*old_info;
83
83
  head_length=sizeof(share_buff.state.header);
84
84
  memset(&info, 0, sizeof(info));
85
85
 
86
 
  my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,
87
 
                                   MY_UNPACK_FILENAME),MYF(0));
 
86
  (void)fn_format(org_name,name,"",MI_NAME_IEXT, MY_UNPACK_FILENAME);
 
87
  if (!realpath(org_name,rp_buff))
 
88
    my_load_path(rp_buff,org_name, NULL);
 
89
  rp_buff[FN_REFLEN-1]= '\0';
 
90
  strcpy(name_buff,rp_buff);
88
91
  pthread_mutex_lock(&THR_LOCK_myisam);
89
92
  if (!(old_info=test_if_reopen(name_buff)))
90
93
  {