MWL#55: mysql_upgrade_service.exe will now ensure that datadir is always written to my.ini file

sql/mysql_upgrade_service.cc

@@ -339,6 +339,8 @@ static void change_service_config()
 
   char defaults_file[MAX_PATH];
   char default_character_set[64];
+  char buf[MAX_PATH];
+  int i;
 
   scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
   if(!scm)
@@ -376,10 +378,8 @@ static void change_service_config()
     /*
       Weird case, no --defaults-file in service definition, need to create one.
     */
-    char buf[MAX_PATH];
-    int i;
-
     sprintf_s(props.inifile, MAX_PATH, "%s\\my.ini", props.datadir);
+  }
 
   /*
     Write datadir to my.ini, after converting  backslashes to 
@@ -391,9 +391,8 @@ static void change_service_config()
     if (buf[i] == '\\')
       buf[i]= '/';
   }
-
   WritePrivateProfileString("mysqld", "datadir",buf, props.inifile);
-  }
+
   /*
     Remove basedir from defaults file, otherwise the service wont come up in 
     the new  version, and will complain about mismatched message file.