← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisampack.c

merging from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisampack.c
327
327
      verbose= 1;
328
328
    break;
329
329
  case 'T':
330
 
    length= (uint) (strmov(tmp_dir, argument) - tmp_dir);
 
330
    length= (uint) (stpcpy(tmp_dir, argument) - tmp_dir);
331
331
    if (length != dirname_length(tmp_dir))
332
332
    {
333
333
      tmp_dir[length]=FN_LIBCHAR;
492
492
    /* Make a new indexfile based on first file in list */
493
493
    uint length;
494
494
    uchar *buff;
495
 
    strmov(org_name,result_table);              /* Fix error messages */
 
495
    stpcpy(org_name,result_table);              /* Fix error messages */
496
496
    VOID(fn_format(new_name,result_table,"",MI_NAME_IEXT,2));
497
497
    if ((join_isam_file=my_create(new_name,0,tmpfile_createflag,MYF(MY_WME)))
498
498
        < 0)