Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

1 files changed, 8 insertions, 8 deletions

diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc
index 63de47a7b69..f7eab075952 100644
--- a/server-tools/instance-manager/options.cc
+++ b/server-tools/instance-manager/options.cc
@@ -312,27 +312,27 @@ int Options::load(int argc, char **argv)
         '.angel.pid'.
       */
 
-      char *angel_pid_file_name;
+      char *local_angel_pid_file_name;
       char *base_name_ptr;
       char *ext_ptr;
 
-      angel_pid_file_name= (char *) malloc(strlen(Options::pid_file_name) +
-                                           ANGEL_PID_FILE_SUFFIX_LEN);
+      local_angel_pid_file_name= (char *) malloc(strlen(Options::pid_file_name) +
+                                                 ANGEL_PID_FILE_SUFFIX_LEN);
 
-      strcpy(angel_pid_file_name, Options::pid_file_name);
+      strcpy(local_angel_pid_file_name, Options::pid_file_name);
 
-      base_name_ptr= strrchr(angel_pid_file_name, '/');
+      base_name_ptr= strrchr(local_angel_pid_file_name, '/');
 
       if (!base_name_ptr)
-        base_name_ptr= angel_pid_file_name + 1;
+        base_name_ptr= local_angel_pid_file_name + 1;
 
       ext_ptr= strrchr(base_name_ptr, '.');
       if (ext_ptr)
         *ext_ptr= 0;
 
-      strcat(angel_pid_file_name, ANGEL_PID_FILE_SUFFIX);
+      strcat(local_angel_pid_file_name, ANGEL_PID_FILE_SUFFIX);
 
-      Options::angel_pid_file_name= angel_pid_file_name;
+      Options::angel_pid_file_name= local_angel_pid_file_name;
     }
     else
     {