← 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-10-15 06:44:44 UTC
  • mfrom: (512.1.21 drizzle-stew)
  • Revision ID: brian@tangent.org-20081015064444-p5ccnpyz558oaquy
Merging Stewart's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
3027
3027
    {
3028
3028
      my_off_t offset= BIN_LOG_HEADER_SIZE + FLAGS_OFFSET;
3029
3029
      unsigned char flags= 0;            // clearing LOG_EVENT_BINLOG_IN_USE_F
3030
 
      pwrite(log_file.file, &flags, 1, offset);
 
3030
      assert(pwrite(log_file.file, &flags, 1, offset)==1);
3031
3031
    }
3032
3032
 
3033
3033
    /* this will cleanup IO_CACHE, sync and close the file */
3152
3152
      size_t bytes;
3153
3153
      unsigned char buf[IO_SIZE];
3154
3154
 
3155
 
      freopen(err_temp,"a+",stderr);
 
3155
      if(freopen(err_temp,"a+",stderr)==NULL)
 
3156
        return 1;
3156
3157
      (void) my_delete(err_renamed, MYF(0));
3157
3158
      my_rename(log_error_file,err_renamed,MYF(0));
3158
 
      if (freopen(log_error_file,"a+",stdout))
3159
 
        freopen(log_error_file,"a+",stderr);
 
3159
      if (freopen(log_error_file,"a+",stdout)==NULL)
 
3160
        return 1;
 
3161
      else
 
3162
        if(freopen(log_error_file,"a+",stderr)==NULL)
 
3163
          return 1;
3160
3164
 
3161
3165
      if ((fd = my_open(err_temp, O_RDONLY, MYF(0))) >= 0)
3162
3166
      {