← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-10-10 01:40:50 UTC
  • mto: This revision was merged to the branch mainline in revision 499.
  • Revision ID: monty@inaugust.com-20081010014050-8mmtwqy6ii4boq3o
Removed O_BINARY and FILE_BINARY.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
4029
4029
  thd->set_proc_info(proc_info);
4030
4030
  my_delete(fname_buf, MYF(0)); // old copy may exist already
4031
4031
  if ((fd= my_create(fname_buf, CREATE_MODE,
4032
 
                     O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
 
4032
                     O_WRONLY | O_EXCL | O_NOFOLLOW,
4033
4033
                     MYF(MY_WME))) < 0 ||
4034
4034
      init_io_cache(&file, fd, IO_SIZE, WRITE_CACHE, (my_off_t)0, 0,
4035
4035
                    MYF(MY_WME|MY_NABP)))
4057
4057
  // fname_buf now already has .data, not .info, because we did our trick
4058
4058
  my_delete(fname_buf, MYF(0)); // old copy may exist already
4059
4059
  if ((fd= my_create(fname_buf, CREATE_MODE,
4060
 
                     O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
 
4060
                     O_WRONLY | O_EXCL | O_NOFOLLOW,
4061
4061
                     MYF(MY_WME))) < 0)
4062
4062
  {
4063
4063
    rli->report(ERROR_LEVEL, my_errno,
4178
4178
  {
4179
4179
    my_delete(fname, MYF(0)); // old copy may exist already
4180
4180
    if ((fd= my_create(fname, CREATE_MODE,
4181
 
                       O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
 
4181
                       O_WRONLY | O_EXCL | O_NOFOLLOW,
4182
4182
                       MYF(MY_WME))) < 0)
4183
4183
    {
4184
4184
      rli->report(ERROR_LEVEL, my_errno,
4187
4187
      goto err;
4188
4188
    }
4189
4189
  }
4190
 
  else if ((fd = my_open(fname, O_WRONLY | O_APPEND | O_BINARY | O_NOFOLLOW,
 
4190
  else if ((fd = my_open(fname, O_WRONLY | O_APPEND | O_NOFOLLOW,
4191
4191
                         MYF(MY_WME))) < 0)
4192
4192
  {
4193
4193
    rli->report(ERROR_LEVEL, my_errno,
4354
4354
  Load_log_event *lev= 0;
4355
4355
 
4356
4356
  ext= slave_load_file_stem(fname, file_id, server_id, ".info");
4357
 
  if ((fd = my_open(fname, O_RDONLY | O_BINARY | O_NOFOLLOW,
 
4357
  if ((fd = my_open(fname, O_RDONLY | O_NOFOLLOW,
4358
4358
                    MYF(MY_WME))) < 0 ||
4359
4359
      init_io_cache(&file, fd, IO_SIZE, READ_CACHE, (my_off_t)0, 0,
4360
4360
                    MYF(MY_WME|MY_NABP)))