summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/options.h
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-02-15 04:38:33 +0300
committerunknown <petr@mysql.com>2005-02-15 04:38:33 +0300
commitdeba12cd34ad4378465d5691de1d50fe1233121a (patch)
tree11422217e66ff042bc75eb00563d6c7b1f36e26f /server-tools/instance-manager/options.h
parent5bd607785a1f72b826831ab45c99d75b69846531 (diff)
downloadmariadb-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/options.h')
-rw-r--r--server-tools/instance-manager/options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h
index bb6da51d1ca..1b8570dd7ba 100644
--- a/server-tools/instance-manager/options.h
+++ b/server-tools/instance-manager/options.h
@@ -41,7 +41,7 @@ struct Options
static char **saved_argv;
- static void load(int argc, char **argv);
+ static int load(int argc, char **argv);
void cleanup();
};