bk commit into 5.0 tree (petr:1.2061) BUG#12674

[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.2061 06/02/21 15:32:52 petr@stripped +2 -0
  Fix for Bug #12674  "Instance Manager: IM doesn't handle client
  connections correctly".
  Recommit with the max timeout value in sync with the comment.

  server-tools/instance-manager/priv.h
    1.10 06/02/21 15:32:49 petr@stripped +2 -0
    add a const for max wait timeout

  server-tools/instance-manager/options.cc
    1.30 06/02/21 15:32:49 petr@stripped +6 -0
    add new option to set wait timeout

# 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:	outpost.site
# Root:	/home/cps/mysql/devel/im/5.0-im-add-error-message

--- 1.29/server-tools/instance-manager/options.cc	2006-02-10 02:15:52 +03:00
+++ 1.30/server-tools/instance-manager/options.cc	2006-02-21 15:32:49 +03:00
@@ -79,6 +79,7 @@
 #endif
   OPT_MONITORING_INTERVAL,
   OPT_PORT,
+  OPT_WAIT_TIMEOUT,
   OPT_BIND_ADDRESS
 };
 
@@ -150,6 +151,11 @@
 #endif
   { "version", 'V', "Output version information and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
+
+  { "wait-timeout", OPT_WAIT_TIMEOUT, "The number of seconds IM waits "
+    "for activity on a connection before closing it.",
+    (gptr *) &net_read_timeout, (gptr *) &net_read_timeout, 0, GET_ULONG,
+    REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0 },
 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }
 };

--- 1.9/server-tools/instance-manager/priv.h	2006-02-10 02:15:52 +03:00
+++ 1.10/server-tools/instance-manager/priv.h	2006-02-21 15:32:49 +03:00
@@ -28,6 +28,8 @@
 #define SERVER_DEFAULT_PORT 3306
 #define DEFAULT_MONITORING_INTERVAL 20
 #define DEFAULT_PORT 2273
+/* three-week timeout should be enough */
+#define LONG_TIMEOUT ((ulong) 3600L*24L*21L)
 
 /* the pid of the manager process (of the signal thread on the LinuxThreads) */
 extern pid_t manager_pid;