diff options
| author | unknown <petr@mysql.com> | 2005-02-15 04:38:33 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-15 04:38:33 +0300 |
| commit | deba12cd34ad4378465d5691de1d50fe1233121a (patch) | |
| tree | 11422217e66ff042bc75eb00563d6c7b1f36e26f /server-tools/instance-manager/instance.cc | |
| parent | 5bd607785a1f72b826831ab45c99d75b69846531 (diff) | |
| download | mariadb-git-deba12cd34ad4378465d5691de1d50fe1233121a.tar.gz | |
some more cleanups and fixes
server-tools/instance-manager/commands.cc:
typo fixed
server-tools/instance-manager/instance.cc:
moved options.complete_initialization to the instance::complete_initialization
server-tools/instance-manager/instance.h:
moved options.complete_initialization to the Instance::complete_initialization
server-tools/instance-manager/instance_map.cc:
moved options.complete_initialization to the Instance::complete_initialization, added code to create
default instance if none is given iin config. file
server-tools/instance-manager/instance_map.h:
complete_initialization now returns an error in case of a problem
server-tools/instance-manager/instance_options.cc:
some error handling added
server-tools/instance-manager/instance_options.h:
error handling added
server-tools/instance-manager/manager.cc:
error handling added
server-tools/instance-manager/mysqlmanager.cc:
stop mysqlmanager if options were not loaded correctly
server-tools/instance-manager/options.cc:
return-value added
server-tools/instance-manager/options.h:
return-value added to the OPtions::load()
server-tools/instance-manager/parse_output.cc:
no need to examine mysqld --help -v termination status
Diffstat (limited to 'server-tools/instance-manager/instance.cc')
| -rw-r--r-- | server-tools/instance-manager/instance.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index e654612de3e..f2140ee7200 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -296,8 +296,9 @@ int Instance::init(const char *name_arg) } -int Instance::complete_initialization(Instance_map *instance_map_arg) +int Instance::complete_initialization(Instance_map *instance_map_arg, + const char *mysqld_path) { instance_map= instance_map_arg; - return 0; + return options.complete_initialization(mysqld_path); } |