bk commit into 5.1 tree (jimw:1.2337)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.2337 06/04/12 13:01:26 jimw@stripped +1 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  server-tools/instance-manager/options.cc
    1.32 06/04/12 13:01:23 jimw@stripped +4 -4
    Resolve conflict

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.31/server-tools/instance-manager/options.cc	2006-04-12 11:14:51 -07:00
+++ 1.32/server-tools/instance-manager/options.cc	2006-04-12 13:01:23 -07:00
@@ -91,73 +91,80 @@
   { "help", '?', "Display this help and exit.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
+  { "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
+    (gptr *) &Options::bind_address, (gptr *) &Options::bind_address,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
 #ifndef DBUG_OFF
   {"debug", '#', "Debug log.",
    (gptr*) &Options::default_dbug_option, (gptr*) &Options::default_dbug_option,
    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
 
+  { "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
+    " Server binary.",
+    (gptr *) &Options::default_mysqld_path,
+    (gptr *) &Options::default_mysqld_path,
+    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
+#ifdef __WIN__
+  { "install", OPT_INSTALL_SERVICE, "Install as system service.",
+    (gptr *) &Options::install_as_service, (gptr*) &Options::install_as_service,
+    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
+#endif
+
   { "log", OPT_LOG, "Path to log file. Used only with --run-as-service.",
     (gptr *) &Options::log_file_name, (gptr *) &Options::log_file_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "pid-file", OPT_PID_FILE, "Pid file to use.",
-    (gptr *) &Options::pid_file_name, (gptr *) &Options::pid_file_name,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-
-  { "socket", OPT_SOCKET, "Socket file to use for connection.",
-    (gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name,
-    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
+    " instances in seconds.",
+    (gptr *) &Options::monitoring_interval,
+    (gptr *) &Options::monitoring_interval,
+    0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
+    0, 0, 0, 0, 0 },
 
   { "passwd", 'P', "Prepare entry for passwd file and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
-    (gptr *) &Options::bind_address, (gptr *) &Options::bind_address,
-    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-
-  { "port", OPT_PORT, "Port number to use for connections",
-    (gptr *) &Options::port_number, (gptr *) &Options::port_number,
-    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
-
   { "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"
                                         " and passwords here.",
     (gptr *) &Options::password_file_name,
     (gptr *) &Options::password_file_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
-    " Server binary.",
-    (gptr *) &Options::default_mysqld_path,
-    (gptr *) &Options::default_mysqld_path,
-    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
+  { "pid-file", OPT_PID_FILE, "Pid file to use.",
+    (gptr *) &Options::pid_file_name, (gptr *) &Options::pid_file_name,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
+  { "port", OPT_PORT, "Port number to use for connections",
+    (gptr *) &Options::port_number, (gptr *) &Options::port_number,
+    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
 
-  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
-    " instances in seconds.",
-    (gptr *) &Options::monitoring_interval,
-    (gptr *) &Options::monitoring_interval,
-    0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
-    0, 0, 0, 0, 0 },
 #ifdef __WIN__
-  { "install", OPT_INSTALL_SERVICE, "Install as system service.",
-    (gptr *) &Options::install_as_service, (gptr*) &Options::install_as_service,
-    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
   { "remove", OPT_REMOVE_SERVICE, "Remove system service.",
     (gptr *)&Options::remove_service, (gptr*) &Options::remove_service,
     0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
-  { "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
-    (gptr *)&Options::stand_alone, (gptr*) &Options::stand_alone,
-    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
 #else
   { "run-as-service", OPT_RUN_AS_SERVICE,
     "Daemonize and start angel process.", (gptr *) &Options::run_as_service,
     0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
+#endif
 
+  { "socket", OPT_SOCKET, "Socket file to use for connection.",
+    (gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
+#ifdef __WIN__
+  { "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
+    (gptr *)&Options::stand_alone, (gptr*) &Options::stand_alone,
+    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
+#else
   { "user", OPT_USER, "Username to start mysqlmanager",
     (gptr *) &Options::user,
     (gptr *) &Options::user,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 #endif
+
   { "version", 'V', "Output version information and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },