← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

merge latest changes from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
746
746
{
747
747
  File file;
748
748
 
749
 
  if ((file = my_open(log_file_name, O_RDONLY | O_BINARY | O_SHARE, 
 
749
  if ((file = my_open(log_file_name, O_RDONLY, 
750
750
                      MYF(MY_WME))) < 0)
751
751
  {
752
752
    sql_print_error(_("Failed to open log (file '%s', errno %d)"),
860
860
{
861
861
  char buff[FN_REFLEN];
862
862
  File file= -1;
863
 
  int open_flags= O_CREAT | O_BINARY;
 
863
  int open_flags= O_CREAT;
864
864
 
865
865
  write_error= 0;
866
866
 
1123
1123
  fn_format(index_file_name, index_file_name_arg, mysql_data_home,
1124
1124
            ".index", opt);
1125
1125
  if ((index_file_nr= my_open(index_file_name,
1126
 
                              O_RDWR | O_CREAT | O_BINARY ,
 
1126
                              O_RDWR | O_CREAT,
1127
1127
                              MYF(MY_WME))) < 0 ||
1128
1128
       my_sync(index_file_nr, MYF(MY_WME)) ||
1129
1129
       init_io_cache(&index_file, index_file_nr,