Commit 0a970b12 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
parents 682decc0 8a1dd17b

server-tools/instance-manager/options.cc

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ enum options { 
#endif

  OPT_MONITORING_INTERVAL,

  OPT_PORT,

  OPT_WAIT_TIMEOUT,

  OPT_BIND_ADDRESS

};
@@ -151,6 +152,11 @@ static struct my_option my_long_options[] = 
  { "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 }

};

server-tools/instance-manager/priv.h

+2 −0
Original line number Diff line number Diff line
@@ -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;