← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: ysano
  • Date: 2008-11-04 00:22:10 UTC
  • mto: (575.1.9 devel)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: ysano@vm-20081104002210-hme6ume0rtxf9lme
Rename mysql to drizzle.

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
 
1002
1002
 
1003
1003
int DRIZZLE_LOG::generate_new_name(char *new_name, const char *log_name)
1004
1004
{
1005
 
  fn_format(new_name, log_name, mysql_data_home, "", 4);
 
1005
  fn_format(new_name, log_name, drizzle_data_home, "", 4);
1006
1006
  if (log_type == LOG_BIN)
1007
1007
  {
1008
1008
    if (!fn_ext(log_name)[0])
1115
1115
    index_file_name_arg= log_name;    // Use same basename for index file
1116
1116
    opt= MY_UNPACK_FILENAME | MY_REPLACE_EXT;
1117
1117
  }
1118
 
  fn_format(index_file_name, index_file_name_arg, mysql_data_home,
 
1118
  fn_format(index_file_name, index_file_name_arg, drizzle_data_home,
1119
1119
            ".index", opt);
1120
1120
  if ((index_file_nr= my_open(index_file_name,
1121
1121
                              O_RDWR | O_CREAT,
3339
3339
  tc_log_page_size= getpagesize();
3340
3340
  assert(TC_LOG_PAGE_SIZE % tc_log_page_size == 0);
3341
3341
 
3342
 
  fn_format(logname,opt_name,mysql_data_home,"",MY_UNPACK_FILENAME);
 
3342
  fn_format(logname,opt_name,drizzle_data_home,"",MY_UNPACK_FILENAME);
3343
3343
  if ((fd= my_open(logname, O_RDWR, MYF(0))) < 0)
3344
3344
  {
3345
3345
    if (my_errno != ENOENT)