← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

merging from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
185
185
 
186
186
    share->path.str= path_buff;
187
187
    share->path.length= path_length;
188
 
    strmov(share->path.str, path);
 
188
    stpcpy(share->path.str, path);
189
189
    share->normalized_path.str=    share->path.str;
190
190
    share->normalized_path.length= path_length;
191
191
 
400
400
 
401
401
    /* Unencoded 5.0 table name found */
402
402
    path[length]= '\0'; // Remove .frm extension
403
 
    strmov(share->normalized_path.str, path);
 
403
    stpcpy(share->normalized_path.str, path);
404
404
    share->normalized_path.length= length;
405
405
  }
406
406
 
634
634
    }
635
635
  }
636
636
  keynames=(char*) key_part;
637
 
  strpos+= (strmov(keynames, (char *) strpos) - keynames)+1;
 
637
  strpos+= (stpcpy(keynames, (char *) strpos) - keynames)+1;
638
638
 
639
639
  //reading index comments
640
640
  for (keyinfo= share->key_info, i=0; i < keys; i++, keyinfo++)