bk commit into 5.0 tree (petr:1.1984)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1984 05/06/29 13:27:27 petr@stripped +1 -0
  post review fixes (second review)

  mysys/default_modify.c
    1.9 05/06/29 13:27:18 petr@stripped +4 -2
    post review fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0

--- 1.8/mysys/default_modify.c	2005-06-29 02:24:22 +04:00
+++ 1.9/mysys/default_modify.c	2005-06-29 13:27:18 +04:00
@@ -71,7 +71,7 @@
   uint opt_len, optval_len, sect_len, nr_newlines= 0, buffer_size;
   my_bool in_section= FALSE, opt_applied= 0;
   uint reserve_extended= 1, old_opt_len= 0;
-  uint new_opt_len= opt_len + 1 + optval_len + NEWLINE_LEN;
+  uint new_opt_len;
   int reserve_occupied= 0;
   DBUG_ENTER("modify_defaults_file");
 
@@ -80,10 +80,12 @@
 
   /* my_fstat doesn't use the flag parameter */
   if (my_fstat(fileno(cnf_file), &file_stat, MYF(0)))
-    goto err;
+    goto malloc_err;
 
   opt_len= (uint) strlen(option);
   optval_len= (uint) strlen(option_value);
+
+  new_opt_len= opt_len + 1 + optval_len + NEWLINE_LEN;
 
   /* calculate the size of the buffer we need */
   buffer_size= sizeof(char) * (file_stat.st_size +