← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default_modify.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 17:44:14 UTC
  • mfrom: (177 drizzle)
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717174414-sm1e9agb2fjw2ncz
Merged in from trunk.

Made following changes:

libdrizzle/
  client.c
  * Removed DBUG symbols entirely
  * Removed mysql_debug() calls and command line options
  libdrizzle.c
  * Removed DBUG symbols
include/my_sys.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())
mysys/my_init.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default_modify.c
69
69
  uint reserve_extended;
70
70
  uint new_opt_len;
71
71
  int reserve_occupied= 0;
 
72
  DBUG_ENTER("modify_defaults_file");
72
73
 
73
74
  if (!(cnf_file= my_fopen(file_location, O_RDWR | O_BINARY, MYF(0))))
74
 
    return(2);
 
75
    DBUG_RETURN(2);
75
76
 
76
77
  if (fstat(fileno(cnf_file), &file_stat))
77
78
    goto malloc_err;
215
216
      goto err;
216
217
  }
217
218
  if (my_fclose(cnf_file, MYF(MY_WME)))
218
 
    return(1);
 
219
    DBUG_RETURN(1);
219
220
 
220
221
  my_free(file_buffer, MYF(0));
221
 
  return(0);
 
222
  DBUG_RETURN(0);
222
223
 
223
224
err:
224
225
  my_free(file_buffer, MYF(0));
225
226
malloc_err:
226
227
  my_fclose(cnf_file, MYF(0));
227
 
  return(1); /* out of resources */
 
228
  DBUG_RETURN(1); /* out of resources */
228
229
}
229
230
 
230
231