← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.c

Merged current state of use-replace-funcs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_open.c
135
135
    /* Don't call realpath() if the name can't be a link */
136
136
    if (!strcmp(name_buff, org_name) ||
137
137
        my_readlink(index_name, org_name, MYF(0)) == -1)
138
 
      (void) strmov(index_name, org_name);
 
138
      (void) stpcpy(index_name, org_name);
139
139
    *strrchr(org_name, '.')= '\0';
140
140
    (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,
141
141
                     MY_APPEND_EXT|MY_UNPACK_FILENAME|MY_RESOLVE_SYMLINKS);
250
250
           sizeof(my_off_t)*keys);
251
251
    memcpy(share->state.key_del, key_del,
252
252
           sizeof(my_off_t) * share->state.header.max_block_size_index);
253
 
    strmov(share->unique_file_name, name_buff);
 
253
    stpcpy(share->unique_file_name, name_buff);
254
254
    share->unique_name_length= strlen(name_buff);
255
 
    strmov(share->index_file_name,  index_name);
256
 
    strmov(share->data_file_name,   data_name);
 
255
    stpcpy(share->index_file_name,  index_name);
 
256
    stpcpy(share->data_file_name,   data_name);
257
257
 
258
258
    share->blocksize=min(IO_SIZE,myisam_block_size);
259
259
    {
459
459
  if (!have_rtree)
460
460
    info.rtree_recursion_state= NULL;
461
461
 
462
 
  strmov(info.filename,name);
 
462
  stpcpy(info.filename,name);
463
463
  memcpy(info.blobs,share->blobs,sizeof(MI_BLOB)*share->base.blobs);
464
464
  info.lastkey2=info.lastkey+share->base.max_key_length;
465
465