diff options
author | unknown <petr@mysql.com> | 2005-06-01 04:40:22 +0400 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-06-01 04:40:22 +0400 |
commit | 26f03563f724b1bcab931d1120a56825135ce24c (patch) | |
tree | 9ad013e8ea02fb9d7bc9887be150da9b869ae2b7 /server-tools/instance-manager/options.cc | |
parent | 1c7b61e3aef5227165a9957ead000e67935708b2 (diff) | |
download | mariadb-git-26f03563f724b1bcab931d1120a56825135ce24c.tar.gz |
fix IM to display version string in "show instance status" (Bug #10229)
server-tools/instance-manager/buffer.h:
fix for the valgring error
server-tools/instance-manager/commands.cc:
sent the version string
server-tools/instance-manager/instance_options.cc:
compute and store the version string
server-tools/instance-manager/instance_options.h:
add a version string option, and added caching of the mysqld_path length
server-tools/instance-manager/options.cc:
fix valgrind error
server-tools/instance-manager/parse_output.cc:
Add an option to parse_output_and_get_value in order to be
able to get the rest of the string after the found word in
the output of popen() (E.g. a version string).
server-tools/instance-manager/parse_output.h:
prototype changed
Diffstat (limited to 'server-tools/instance-manager/options.cc')
-rw-r--r-- | server-tools/instance-manager/options.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 28899940e47..e44e4c6ff34 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -224,10 +224,10 @@ int Options::load(int argc, char **argv) /* config-file options are prepended to command-line ones */ load_defaults("my", default_groups, &argc, &argv); + Options::saved_argv= argv; if ((rc= handle_options(&argc, &argv, my_long_options, get_one_option)) != 0) return rc; - Options::saved_argv= argv; return 0; } |