summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/options.cc
diff options
context:
space:
mode:
Diffstat (limited to 'server-tools/instance-manager/options.cc')
-rw-r--r--server-tools/instance-manager/options.cc74
1 files changed, 37 insertions, 37 deletions
diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc
index 74e7812ea72..7eba3187dd9 100644
--- a/server-tools/instance-manager/options.cc
+++ b/server-tools/instance-manager/options.cc
@@ -152,14 +152,14 @@ static struct my_option my_long_options[] =
#ifndef __WIN__
{ "angel-pid-file", OPT_ANGEL_PID_FILE, "Pid file for angel process.",
- (gptr *) &Options::Daemon::angel_pid_file_name,
- (gptr *) &Options::Daemon::angel_pid_file_name,
+ (uchar* *) &Options::Daemon::angel_pid_file_name,
+ (uchar* *) &Options::Daemon::angel_pid_file_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif
{ "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
- (gptr *) &Options::Main::bind_address,
- (gptr *) &Options::Main::bind_address,
+ (uchar* *) &Options::Main::bind_address,
+ (uchar* *) &Options::Main::bind_address,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "check-password-file", OPT_CHECK_PASSWORD_FILE,
@@ -172,15 +172,15 @@ static struct my_option my_long_options[] =
#ifndef DBUG_OFF
{"debug", '#', "Debug log.",
- (gptr *) &Options::Debug::config_str,
- (gptr *) &Options::Debug::config_str,
+ (uchar* *) &Options::Debug::config_str,
+ (uchar* *) &Options::Debug::config_str,
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::Main::default_mysqld_path,
- (gptr *) &Options::Main::default_mysqld_path,
+ (uchar* *) &Options::Main::default_mysqld_path,
+ (uchar* *) &Options::Main::default_mysqld_path,
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
{ "drop-user", OPT_DROP_USER,
@@ -193,8 +193,8 @@ static struct my_option my_long_options[] =
#ifdef __WIN__
{ "install", OPT_INSTALL_SERVICE, "Install as system service.",
- (gptr *) &Options::Service::install_as_service,
- (gptr *) &Options::Service::install_as_service,
+ (uchar* *) &Options::Service::install_as_service,
+ (uchar* *) &Options::Service::install_as_service,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
#endif
@@ -204,22 +204,22 @@ static struct my_option my_long_options[] =
#ifndef __WIN__
{ "log", OPT_LOG, "Path to log file. Used only with --run-as-service.",
- (gptr *) &Options::Daemon::log_file_name,
- (gptr *) &Options::Daemon::log_file_name,
+ (uchar* *) &Options::Daemon::log_file_name,
+ (uchar* *) &Options::Daemon::log_file_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif
{ "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
" instances in seconds.",
- (gptr *) &Options::Main::monitoring_interval,
- (gptr *) &Options::Main::monitoring_interval,
+ (uchar* *) &Options::Main::monitoring_interval,
+ (uchar* *) &Options::Main::monitoring_interval,
0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
0, 0, 0, 0, 0 },
{ "mysqld-safe-compatible", OPT_MYSQLD_SAFE_COMPATIBLE,
"Start Instance Manager in mysqld_safe compatible manner",
- (gptr *) &Options::Main::mysqld_safe_compatible,
- (gptr *) &Options::Main::mysqld_safe_compatible,
+ (uchar* *) &Options::Main::mysqld_safe_compatible,
+ (uchar* *) &Options::Main::mysqld_safe_compatible,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
{ "print-password-line", OPT_PRINT_PASSWORD_LINE,
@@ -227,61 +227,61 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "password", OPT_PASSWORD, "Password to update the password file",
- (gptr *) &Options::User_management::password,
- (gptr *) &Options::User_management::password,
+ (uchar* *) &Options::User_management::password,
+ (uchar* *) &Options::User_management::password,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "password-file", OPT_PASSWORD_FILE,
"Look for Instance Manager users and passwords here.",
- (gptr *) &Options::Main::password_file_name,
- (gptr *) &Options::Main::password_file_name,
+ (uchar* *) &Options::Main::password_file_name,
+ (uchar* *) &Options::Main::password_file_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "pid-file", OPT_PID_FILE, "Pid file to use.",
- (gptr *) &Options::Main::pid_file_name,
- (gptr *) &Options::Main::pid_file_name,
+ (uchar* *) &Options::Main::pid_file_name,
+ (uchar* *) &Options::Main::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::Main::port_number,
- (gptr *) &Options::Main::port_number,
+ (uchar* *) &Options::Main::port_number,
+ (uchar* *) &Options::Main::port_number,
0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
#ifdef __WIN__
{ "remove", OPT_REMOVE_SERVICE, "Remove system service.",
- (gptr *) &Options::Service::remove_service,
- (gptr *) &Options::Service::remove_service,
+ (uchar* *) &Options::Service::remove_service,
+ (uchar* *) &Options::Service::remove_service,
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::Daemon::run_as_service,
+ (uchar* *) &Options::Daemon::run_as_service,
0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
#endif
#ifndef __WIN__
{ "socket", OPT_SOCKET, "Socket file to use for connection.",
- (gptr *) &Options::Main::socket_file_name,
- (gptr *) &Options::Main::socket_file_name,
+ (uchar* *) &Options::Main::socket_file_name,
+ (uchar* *) &Options::Main::socket_file_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif
#ifdef __WIN__
{ "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
- (gptr *) &Options::Service::stand_alone,
- (gptr *) &Options::Service::stand_alone,
+ (uchar* *) &Options::Service::stand_alone,
+ (uchar* *) &Options::Service::stand_alone,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
#else
{ "user", OPT_USER, "Username to start mysqlmanager",
- (gptr *) &Options::Daemon::user,
- (gptr *) &Options::Daemon::user,
+ (uchar* *) &Options::Daemon::user,
+ (uchar* *) &Options::Daemon::user,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif
{ "username", OPT_USERNAME,
"Username to update the password file",
- (gptr *) &Options::User_management::user_name,
- (gptr *) &Options::User_management::user_name,
+ (uchar* *) &Options::User_management::user_name,
+ (uchar* *) &Options::User_management::user_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "version", 'V', "Output version information and exit.", 0, 0, 0,
@@ -289,8 +289,8 @@ static struct my_option my_long_options[] =
{ "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,
+ (uchar* *) &net_read_timeout,
+ (uchar* *) &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 }
View Lorry Controller Status