bk commit into 5.0 tree (petr:1.1982)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1982 05/09/20 03:14:07 petr@stripped +4 -0
  fix warnings

  server-tools/instance-manager/user_map.cc
    1.13 05/09/20 03:14:00 petr@stripped +2 -1
    fix compiler warning

  server-tools/instance-manager/commands.cc
    1.31 05/09/20 03:14:00 petr@stripped +2 -2
    fix compiler warning

  server-tools/instance-manager/buffer.h
    1.8 05/09/20 03:14:00 petr@stripped +2 -2
    fix compiler warning

  server-tools/instance-manager/buffer.cc
    1.10 05/09/20 03:14:00 petr@stripped +2 -0
    perform initialization of static consts in .cc file to respect VC6

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0-virgin

--- 1.9/server-tools/instance-manager/buffer.cc	2005-05-16 01:53:56 +04:00
+++ 1.10/server-tools/instance-manager/buffer.cc	2005-09-20 03:14:00 +04:00
@@ -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.

--- 1.7/server-tools/instance-manager/buffer.h	2005-06-01 04:40:10 +04:00
+++ 1.8/server-tools/instance-manager/buffer.h	2005-09-20 03:14:00 +04:00
@@ -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;

--- 1.30/server-tools/instance-manager/commands.cc	2005-08-29 23:29:26 +04:00
+++ 1.31/server-tools/instance-manager/commands.cc	2005-09-20 03:14:00 +04:00
@@ -695,9 +695,9 @@
 
 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);

--- 1.12/server-tools/instance-manager/user_map.cc	2005-08-29 23:29:27 +04:00
+++ 1.13/server-tools/instance-manager/user_map.cc	2005-09-20 03:14:00 +04:00
@@ -66,7 +66,8 @@
   */
   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);