diff options
| author | reggie@fedora.(none) <> | 2005-08-04 09:33:44 -0500 |
|---|---|---|
| committer | reggie@fedora.(none) <> | 2005-08-04 09:33:44 -0500 |
| commit | 72c0a021e91d943dff91dcd051cc32734e0ce165 (patch) | |
| tree | 7d2b6ce9972b0698b18b7bb697e5c7f1fea4fb75 /server-tools/instance-manager/options.h | |
| parent | 48ded4ab3d1b413e8dd8dfd60f4417f02df9d33e (diff) | |
| parent | 8cb3bd41c82ca01ee400185c536cf6c91c167b94 (diff) | |
| download | mariadb-git-72c0a021e91d943dff91dcd051cc32734e0ce165.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into fedora.(none):/home/reggie/bk/im_patch
Diffstat (limited to 'server-tools/instance-manager/options.h')
| -rw-r--r-- | server-tools/instance-manager/options.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index 761d366dfb4..537316fedfc 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -28,13 +28,18 @@ struct Options { +#ifdef __WIN__ + static char install_as_service; + static char remove_service; +#else static char run_as_service; /* handle_options doesn't support bool */ + static const char *user; +#endif 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; - static const char *user; /* the option which should be passed to process_default_option_files */ static uint monitoring_interval; static uint port_number; @@ -44,8 +49,11 @@ struct Options /* argv pointer returned by load_defaults() to be used by free_defaults() */ static char **saved_argv; - static int load(int argc, char **argv); + int load(int argc, char **argv); void cleanup(); +#ifdef __WIN__ + void setup_windows_defaults(const char *progname); +#endif }; #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H |