diff options
Diffstat (limited to 'server-tools/instance-manager/instance_options.h')
| -rw-r--r-- | server-tools/instance-manager/instance_options.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/server-tools/instance-manager/instance_options.h b/server-tools/instance-manager/instance_options.h index 5bc46497d2a..26448c0c2b1 100644 --- a/server-tools/instance-manager/instance_options.h +++ b/server-tools/instance-manager/instance_options.h @@ -38,8 +38,8 @@ class Instance_options public: Instance_options() : mysqld_socket(0), mysqld_datadir(0), mysqld_bind_address(0), - mysqld_pid_file(0), mysqld_port(0), mysqld_path(0), mysqld_user(0), - mysqld_password(0), is_guarded(0), filled_default_options(0) + mysqld_pid_file(0), mysqld_port(0), mysqld_path(0), is_guarded(0), + filled_default_options(0) {} ~Instance_options(); /* fills in argv */ @@ -49,9 +49,17 @@ public: int add_option(const char* option); int init(const char *instance_name_arg); + pid_t get_pid(); + void get_pid_filename(char *result); + int unlink_pidfile(); public: - enum { MAX_NUMBER_OF_DEFAULT_OPTIONS= 1 }; + /* + We need this value to be greater or equal then FN_REFLEN found in + my_global.h to use my_load_path() + */ + enum { MAX_PATH_LEN= 512 }; + enum { MAX_NUMBER_OF_DEFAULT_OPTIONS= 2 }; enum { MEM_ROOT_BLOCK_SIZE= 512 }; char **argv; /* We need the some options, so we store them as a separate pointers */ @@ -63,12 +71,12 @@ public: uint instance_name_len; const char *instance_name; const char *mysqld_path; - const char *mysqld_user; - const char *mysqld_password; const char *is_guarded; DYNAMIC_ARRAY options_array; private: int add_to_argv(const char *option); + int get_default_option(char *result, const char *option_name, + size_t result_len); private: uint filled_default_options; MEM_ROOT alloc; |