Merge mysql.com:/home/jimw/my/mysql-5.1-19059

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/mysqld.cc:
  Auto merged

server-tools/instance-manager/instance_options.cc

@@ -132,7 +132,7 @@ int Instance_options::fill_instance_version()
 
   bzero(result, MAX_VERSION_STRING_LENGTH);
 
-  rc= parse_output_and_get_value(cmd.buffer, mysqld_path,
+  rc= parse_output_and_get_value(cmd.buffer, "Ver",
                                  result, MAX_VERSION_STRING_LENGTH,
                                  GET_LINE);
 

server-tools/instance-manager/parse_output.cc

@@ -96,14 +96,14 @@ int parse_output_and_get_value(const char *command, const char *word,
     linebuf[sizeof(linebuf) - 1]= '\0';        /* safety */
 
     /*
-      Compare the start of our line with the word(s) we are looking for.
+      Find the word(s) we are looking for in the line
     */
-    if (!strncmp(word, linep, wordlen))
+    if ((linep= strstr(linep, word)))
     {
       /*
         If we have found our word(s), then move linep past the word(s)
       */
-      linep+= wordlen;                      
+      linep+= wordlen;
       if (flag & GET_VALUE)
       {
         trim_space((const char**) &linep, &found_word_len);

sql/mysqld.cc

@@ -6774,6 +6774,10 @@ SHOW_VAR status_vars[]= {
 static void print_version(void)
 {
   set_server_version();
+  /*
+    Note: the instance manager keys off the string 'Ver' so it can find the
+    version from the output of 'mysqld --version', so don't change it!
+  */
   printf("%s  Ver %s for %s on %s (%s)\n",my_progname,
 	 server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
 }