summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance_options.h
diff options
context:
space:
mode:
authorpetr@mysql.com <>2005-02-27 18:41:34 +0300
committerpetr@mysql.com <>2005-02-27 18:41:34 +0300
commit912dfdfa3421fc232d1863a6b0c9a207590b4b78 (patch)
tree982685490bba283c69256c4a5183eda88216d20f /server-tools/instance-manager/instance_options.h
parent1e6bfa39c3f21881316fd6d2b22621fe9ccb59ee (diff)
downloadmariadb-git-912dfdfa3421fc232d1863a6b0c9a207590b4b78.tar.gz
post-review fixes + cleanup + some minor fixes
Diffstat (limited to 'server-tools/instance-manager/instance_options.h')
-rw-r--r--server-tools/instance-manager/instance_options.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/server-tools/instance-manager/instance_options.h b/server-tools/instance-manager/instance_options.h
index 5e91ee80f00..06ad0156bc0 100644
--- a/server-tools/instance-manager/instance_options.h
+++ b/server-tools/instance-manager/instance_options.h
@@ -37,9 +37,10 @@ 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), nonguarded(0),
- shutdown_delay(0), filled_default_options(0)
+ mysqld_socket(0), mysqld_datadir(0),
+ mysqld_bind_address(0), mysqld_pid_file(0), mysqld_port(0),
+ mysqld_port_val(0), mysqld_path(0), nonguarded(0), shutdown_delay(0),
+ shutdown_delay_val(0), filled_default_options(0)
{}
~Instance_options();
/* fills in argv */
@@ -68,11 +69,13 @@ public:
const char *mysqld_bind_address;
const char *mysqld_pid_file;
const char *mysqld_port;
- uint instance_name_len;
+ uint mysqld_port_val;
const char *instance_name;
+ uint instance_name_len;
const char *mysqld_path;
const char *nonguarded;
const char *shutdown_delay;
+ uint shutdown_delay_val;
/* this value is computed and cashed here */
DYNAMIC_ARRAY options_array;
private: