bk commit into 5.1 tree (anozdrin:1.2361)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik 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.2361 06/05/18 23:34:35 anozdrin@stripped +1 -0
  Fix compilation on FC4.

  server-tools/instance-manager/instance_options.cc
    1.33 06/05/18 23:34:31 anozdrin@stripped +2 -1
    Fix compilation on FC4.

# 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:	anozdrin
# Host:	station.home
# Root:	/mnt/raid/MySQL/devel/5.1-rt-wl3158

--- 1.32/server-tools/instance-manager/instance_options.cc	2006-05-18 18:57:43 +04:00
+++ 1.33/server-tools/instance-manager/instance_options.cc	2006-05-18 23:34:31 +04:00
@@ -358,6 +358,7 @@
 
 int Instance_options::complete_initialization(const char *default_path)
 {
+  int arg_idx;
   const char *tmp;
   char *end;
 
@@ -428,7 +429,7 @@
   if (add_to_argv(tmp))
     goto err;
 
-  int arg_idx= filled_default_options;
+  arg_idx= filled_default_options;
   for (int opt_idx= 0; opt_idx < get_num_options(); ++opt_idx)
   {
     char option_str[MAX_OPTION_STR_LEN];