bk commit into 5.0 tree (petr:1.2275) BUG#22472

[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@stripped, 2006-10-05 01:24:53+04:00, petr@stripped +2 -0
  Fix Bug #22472 IM: --socket option should be removed from Windows version
  the option is useless on windows. It was removed from listing of
  mysqlmanager --help on Windows

  server-tools/instance-manager/options.cc@stripped, 2006-10-05 01:24:47+04:00, petr@stripped +2 -2
    move socket_file_name under unix-specific define

  server-tools/instance-manager/options.h@stripped, 2006-10-05 01:24:47+04:00, petr@stripped +1 -1
    move socket_file_name under unix-specific define

# 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.local
# Root:	/home/cps/mysql/trees/mysql-5.0-virgin

--- 1.32/server-tools/instance-manager/options.cc	2006-10-05 01:25:01 +04:00
+++ 1.33/server-tools/instance-manager/options.cc	2006-10-05 01:25:01 +04:00
@@ -45,10 +45,10 @@ const char *default_password_file_name= 
 const char *default_log_file_name= QUOTE(DEFAULT_LOG_FILE_NAME);
 const char *Options::config_file= QUOTE(DEFAULT_CONFIG_FILE);
 const char *Options::angel_pid_file_name= NULL;
+const char *Options::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME);
 #endif
 const char *Options::log_file_name= default_log_file_name;
 const char *Options::pid_file_name= QUOTE(DEFAULT_PID_FILE_NAME);
-const char *Options::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME);
 const char *Options::password_file_name= default_password_file_name;
 const char *Options::default_mysqld_path= QUOTE(DEFAULT_MYSQLD_PATH);
 const char *Options::bind_address= 0;           /* No default value */
@@ -106,11 +106,11 @@ static struct my_option my_long_options[
     (gptr *) &Options::angel_pid_file_name,
     (gptr *) &Options::angel_pid_file_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 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 },
+#endif
 
   { "passwd", 'P', "Prepare entry for passwd file and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },

--- 1.15/server-tools/instance-manager/options.h	2006-10-05 01:25:01 +04:00
+++ 1.16/server-tools/instance-manager/options.h	2006-10-05 01:25:01 +04:00
@@ -36,11 +36,11 @@ struct Options
   static char run_as_service;        /* handle_options doesn't support bool */
   static const char *user;
   static const char *angel_pid_file_name;
+  static const char *socket_file_name;
 #endif
   static bool is_forced_default_file;
   static const char *log_file_name;
   static const char *pid_file_name;
-  static const char *socket_file_name;
   static const char *password_file_name;
   static const char *default_mysqld_path;
   /* the option which should be passed to process_default_option_files */