← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: Eric Herman
  • Date: 2008-12-06 22:37:37 UTC
  • mfrom: (656.1.6 devel)
  • mto: (656.1.8 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: eric@mysql.com-20081206223737-viem01l5uhm0w14r
merged from lp:drizzle/mordred

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
688
688
 
689
689
  if (!(dir_info = my_dir(buff,MYF(MY_DONT_SORT))))
690
690
  {                                             // This shouldn't happen
691
 
    my_stpcpy(end,".1");                                // use name+1
 
691
    strcpy(end,".1");                           // use name+1
692
692
    return(0);
693
693
  }
694
694
  file_info= dir_info->dir_entry;
756
756
  }
757
757
 
758
758
  if (new_name)
759
 
    my_stpcpy(log_file_name, new_name);
 
759
    strcpy(log_file_name, new_name);
760
760
  else if (generate_new_name(log_file_name, name))
761
761
    goto err;
762
762