← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-73

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Continuous Integration
  • Date: 2012-09-04 02:34:15 UTC
  • mfrom: (2585.1.3 drizzle-bug-1041314)
  • Revision ID: ci@drizzle.org-20120904023415-0q1qct9q2zqtrul1
Merge lp:~tobi-coldtobi/drizzle/trunk-bug-1041314

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
84
84
  uint32_t i,j,len,errpos,head_length,base_pos,offset,info_length,keys,
85
85
    key_parts,unique_key_parts,uniques;
86
86
  char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN],
87
 
       data_name[FN_REFLEN], rp_buff[PATH_MAX];
 
87
       data_name[FN_REFLEN];
 
88
  char *rp_buff = NULL;
88
89
  unsigned char *disk_cache= NULL;
89
90
  unsigned char *disk_pos, *end_pos;
90
91
  MI_INFO info,*m_info,*old_info;
107
108
                            "",
108
109
                            MI_NAME_IEXT,
109
110
                            MY_UNPACK_FILENAME);
110
 
  if (!realpath(org_name,rp_buff))
111
 
    internal::my_load_path(rp_buff,org_name, NULL);
112
 
  rp_buff[FN_REFLEN-1]= '\0';
113
 
  strcpy(name_buff,rp_buff);
 
111
 
 
112
  rp_buff = realpath(org_name,NULL);
 
113
  if (!rp_buff)
 
114
  {
 
115
        internal::my_load_path(name_buff,org_name, NULL);
 
116
  }  else {
 
117
        if (strlen(rp_buff)>=FN_REFLEN) rp_buff[FN_REFLEN-1]= '\0';
 
118
        strcpy(name_buff,rp_buff);
 
119
        free(rp_buff);
 
120
  }
 
121
 
114
122
  THR_LOCK_myisam.lock();
115
123
  if (!(old_info=test_if_reopen(name_buff)))
116
124
  {