← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: Brian Aker
  • Date: 2008-11-07 23:16:58 UTC
  • mfrom: (575.1.14 devel)
  • Revision ID: brian@tangent.org-20081107231658-fboahr524d1or2ya
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
68
68
char *make_default_log_name(char *buff,const char* log_ext)
69
69
{
70
70
  strmake(buff, pidfile_name, FN_REFLEN-5);
71
 
  return fn_format(buff, buff, mysql_data_home, log_ext,
 
71
  return fn_format(buff, buff, drizzle_data_home, log_ext,
72
72
                   MYF(MY_UNPACK_FILENAME|MY_REPLACE_EXT));
73
73
}
74
74
 
985
985
 
986
986
int DRIZZLE_LOG::generate_new_name(char *new_name, const char *log_name)
987
987
{
988
 
  fn_format(new_name, log_name, mysql_data_home, "", 4);
 
988
  fn_format(new_name, log_name, drizzle_data_home, "", 4);
989
989
  if (log_type == LOG_BIN)
990
990
  {
991
991
    if (!fn_ext(log_name)[0])
1098
1098
    index_file_name_arg= log_name;    // Use same basename for index file
1099
1099
    opt= MY_UNPACK_FILENAME | MY_REPLACE_EXT;
1100
1100
  }
1101
 
  fn_format(index_file_name, index_file_name_arg, mysql_data_home,
 
1101
  fn_format(index_file_name, index_file_name_arg, drizzle_data_home,
1102
1102
            ".index", opt);
1103
1103
  if ((index_file_nr= my_open(index_file_name,
1104
1104
                              O_RDWR | O_CREAT,
3320
3320
  tc_log_page_size= getpagesize();
3321
3321
  assert(TC_LOG_PAGE_SIZE % tc_log_page_size == 0);
3322
3322
 
3323
 
  fn_format(logname,opt_name,mysql_data_home,"",MY_UNPACK_FILENAME);
 
3323
  fn_format(logname,opt_name,drizzle_data_home,"",MY_UNPACK_FILENAME);
3324
3324
  if ((fd= my_open(logname, O_RDWR, MYF(0))) < 0)
3325
3325
  {
3326
3326
    if (my_errno != ENOENT)