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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

server-tools/instance-manager/buffer.cc

@@ -21,6 +21,8 @@
 #include "buffer.h"
 #include <m_string.h>
 
+const uint Buffer::BUFFER_INITIAL_SIZE= 4096;
+const uint Buffer::MAX_BUFFER_SIZE= 16777216;
 
 /*
   Puts the given string to the buffer.

server-tools/instance-manager/buffer.h

@@ -33,9 +33,9 @@
 class Buffer
 {
 private:
-  enum { BUFFER_INITIAL_SIZE= 4096 };
+  static const uint BUFFER_INITIAL_SIZE;
   /* maximum buffer size is 16Mb */
-  enum { MAX_BUFFER_SIZE= 16777216 };
+  static const uint MAX_BUFFER_SIZE;
   size_t buffer_size;
   /* Error flag. Triggered if we get an error of some kind */
   int error;

server-tools/instance-manager/commands.cc

@@ -695,9 +695,9 @@ Set_option::Set_option(Instance_map *instance_map_arg,
 
 int Set_option::correct_file(int skip)
 {
-  int error;
-  const static int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,
+  static const int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,
                                              ER_ACCESS_OPTION_FILE };
+  int error;
 
   error= modify_defaults_file(Options::config_file, option,
                               option_value, instance_name, skip);

server-tools/instance-manager/user_map.cc

@@ -66,7 +66,8 @@ int User::init(const char *line)
   */
   if (password[strlen(password)-2] == '\r')
     line_ending_len= 2;
-  if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + line_ending_len)
+  if (strlen(password) != (uint) (SCRAMBLED_PASSWORD_CHAR_LENGTH +
+                                  line_ending_len))
     goto err;
 
   memcpy(user, name_begin, user_length);