← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default_modify.cc

  • Committer: Brian Aker
  • Date: 2009-03-05 07:55:26 UTC
  • mfrom: (910.1.5 drizzle)
  • Revision ID: brian@tangent.org-20090305075526-ua34bjproq6oxujx
Merge of Brian (test extensions, dead code killing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default_modify.cc
72
72
  uint32_t new_opt_len;
73
73
  int reserve_occupied= 0;
74
74
 
75
 
  if (!(cnf_file= my_fopen(file_location, O_RDWR, MYF(0))))
 
75
  if (!(cnf_file= fopen(file_location, "r+")))
76
76
    return(2);
77
77
 
78
78
  if (fstat(fileno(cnf_file), &file_stat))
214
214
        fwrite(file_buffer, 1, (size_t) (dst_ptr - file_buffer), cnf_file))
215
215
      goto err;
216
216
  }
217
 
  if (my_fclose(cnf_file, MYF(MY_WME)))
 
217
  if (fclose(cnf_file))
218
218
    return(1);
219
219
 
220
220
  free(file_buffer);
223
223
err:
224
224
  free(file_buffer);
225
225
malloc_err:
226
 
  my_fclose(cnf_file, MYF(0));
227
 
  return(1); /* out of resources */
 
226
  fclose(cnf_file);
 
227
 
 
228
  return 1; /* out of resources */
228
229
}
229
230
 
230
231