fix for Bug#7386 - IM fails to compile on alpha with Compaq C++ compiler

server-tools/instance-manager/mysql_connection.cc:
  use enum value instead of extern const in array definition
server-tools/instance-manager/priv.cc:
  added a comment to remind of enum value in mysql_connection.cc

2 files changed, 7 insertions, 1 deletions

diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc
index 9365edc7b91..83b046c1e5b 100644
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -191,9 +191,11 @@ void Mysql_connection_thread::run()
 int Mysql_connection_thread::check_connection()
 {
   ulong pkt_len=0;                              // to hold client reply length
+  /* maximum size of the version string */
+  enum { MAX_VERSION_LENGTH= 80 };
 
   /* buffer for the first packet */             /* packet contains: */
-  char buff[mysqlmanager_version_length + 1 +   // server version, 0-ended
+  char buff[MAX_VERSION_LENGTH + 1 +            // server version, 0-ended
             4 +                                 // connection id
             SCRAMBLE_LENGTH + 2 +               // scramble (in 2 pieces)
             18];                                // server variables: flags,
diff --git a/server-tools/instance-manager/priv.cc b/server-tools/instance-manager/priv.cc
index 8112ebd41d8..4b47fe5b593 100644
--- a/server-tools/instance-manager/priv.cc
+++ b/server-tools/instance-manager/priv.cc
@@ -16,6 +16,10 @@
 
 #include "priv.h"
 
+/*
+  The following string must be less then 80 characters, as
+  mysql_connection.cc relies on it
+*/
 const char mysqlmanager_version[] = "0.2-alpha";
 
 const int mysqlmanager_version_length= sizeof(mysqlmanager_version) - 1;