← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1857
1857
  }
1858
1858
  else
1859
1859
    strncpy(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
1860
 
  my_stpcpy(fn_ext(pidfile_name),".pid");               // Add proper extension
 
1860
  strcpy(fn_ext(pidfile_name),".pid");          // Add proper extension
1861
1861
 
1862
1862
  /*
1863
1863
    Add server status variables to the dynamic list of
3926
3926
  what_to_log= ~ (1L << (uint) COM_TIME);
3927
3927
  refresh_version= 1L;  /* Increments on each reload */
3928
3928
  thread_id= 1;
3929
 
  my_stpcpy(server_version, VERSION);
 
3929
  strcpy(server_version, VERSION);
3930
3930
  myisam_recover_options_str= "OFF";
3931
3931
  myisam_stats_method_str= "nulls_unequal";
3932
3932
  threads.empty();
4321
4321
  char *end= strxmov(server_version, VERSION,
4322
4322
                     DRIZZLE_SERVER_SUFFIX_STR, NULL);
4323
4323
  if (opt_bin_log)
4324
 
    my_stpcpy(end, "-log");                        // This may slow down system
 
4324
    strcpy(end, "-log");                        // This may slow down system
4325
4325
}
4326
4326
 
4327
4327