Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/instance_options.cc

@@ -370,19 +370,19 @@ int Instance_options::complete_initialization(const char *default_path,
     if (!gethostname(hostname, sizeof(hostname) - 1))
     {
       if (instance_type & DEFAULT_SINGLE_INSTANCE)
-        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name, "-",
-                 hostname, ".pid", NullS);
-      else
         strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", hostname,
                  ".pid", NullS);
+      else
+        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name,
+                 "-", hostname, ".pid", NullS);
     }
     else
     {
       if (instance_type & DEFAULT_SINGLE_INSTANCE)
-        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name,
+        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", "mysql",
                  ".pid", NullS);
       else
-        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", "mysql",
+        strxnmov(pidfilename, MAX_PATH_LEN - 1, "--pid-file=", instance_name,
                  ".pid", NullS);
     }
 

server-tools/instance-manager/instance_options.h

@@ -34,7 +34,8 @@
   don't have to synchronize between threads.
 */
 
-enum { USUAL_INSTANCE= 0, DEFAULT_SINGLE_INSTANCE };
+#define USUAL_INSTANCE 0
+#define DEFAULT_SINGLE_INSTANCE 1
 
 class Instance_options
 {

server-tools/instance-manager/parse_output.cc

@@ -86,7 +86,7 @@ int parse_output_and_get_value(const char *command, const char *word,
         an option value) or the whole line (if flag)
       */
       linep+= found_word_len;                     /* swallow the previous one */
-      if (flag & GET_VALUE)    /* not GET_LINE */
+      if (flag & GET_VALUE)
       {
         get_word((const char **) &linep, &found_word_len, NONSPACE);
         if (input_buffer_len <= found_word_len)

server-tools/instance-manager/parse_output.h

@@ -16,7 +16,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-enum { GET_VALUE= 1, GET_LINE };
+#define GET_VALUE 1
+#define GET_LINE  2
 
 int parse_output_and_get_value(const char *command, const char *word,
                                char *result, size_t input_buffer_len,