Commit 6acdc271 authored by unknown's avatar unknown
Browse files

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:
  move socket_file_name under unix-specific define
server-tools/instance-manager/options.h:
  move socket_file_name under unix-specific define
parent 48759d7a

server-tools/instance-manager/options.cc

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ const char *default_password_file_name= QUOTE(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 },

server-tools/instance-manager/options.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */