database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  fedora.(none):/home/reggie/bk/im_patch


server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
server-tools/instance-manager/commands.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
  final merge of IM port code for Windows
This commit is contained in:
unknown
2005-08-04 09:33:44 -05:00
parent be22eacb3b 55b4cb009e
commit 9a2ea3700b
25 changed files with 1231 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server-tools/instance-manager/options.h
View File

@@ -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