diff options
| author | unknown <petr@mysql.com> | 2004-12-29 01:12:09 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-29 01:12:09 +0300 |
| commit | 59b274eab8ff97461f7c88f9f0e347a35deb9842 (patch) | |
| tree | d27152ee86dd2e5cfc385e8aadcf847c32f63fad | |
| parent | 0c83f07c5ea97227b3a01395b29c38c4094162d1 (diff) | |
| parent | b859c1921e834d016576446d2c1d29f91d7f02f9 (diff) | |
| download | mariadb-git-59b274eab8ff97461f7c88f9f0e347a35deb9842.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 7 | ||||
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 207ec3183e6..dacace1af1e 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -266,7 +266,7 @@ int Show_instance_options::do_command(struct st_net *net, if (instance->options.mysqld_path != NULL) { position= 0; - store_to_string(&send_buff, (char *) "mysqld_path", &position); + store_to_string(&send_buff, (char *) "mysqld-path", &position); store_to_string(&send_buff, (char *) instance->options.mysqld_path, &position); @@ -286,7 +286,7 @@ int Show_instance_options::do_command(struct st_net *net, if (instance->options.mysqld_user != NULL) { position= 0; - store_to_string(&send_buff, (char *) "admin_user", &position); + store_to_string(&send_buff, (char *) "admin-user", &position); store_to_string(&send_buff, (char *) instance->options.mysqld_user, &position); @@ -297,7 +297,7 @@ int Show_instance_options::do_command(struct st_net *net, if (instance->options.mysqld_password != NULL) { position= 0; - store_to_string(&send_buff, (char *) "admin_password", &position); + store_to_string(&send_buff, (char *) "admin-password", &position); store_to_string(&send_buff, (char *) instance->options.mysqld_password, &position); @@ -408,7 +408,6 @@ int Stop_instance::execute(struct st_net *net, ulong connection_id) stop_guard(instance); if ((err_code= instance->stop())) return err_code; - printf("instance was stopped\n"); net_send_ok(net, connection_id); return 0; } diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 4f299252bac..fab69865c85 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -101,9 +101,9 @@ int Instance_options::add_option(const char* option) {"--datadir=", 10, &mysqld_datadir, SAVE_WHOLE_AND_ADD}, {"--bind-address=", 15, &mysqld_bind_address, SAVE_WHOLE_AND_ADD}, {"--pid-file=", 11, &mysqld_pid_file, SAVE_WHOLE_AND_ADD}, - {"--mysqld_path=", 14, &mysqld_path, SAVE_VALUE}, - {"--admin_user=", 13, &mysqld_user, SAVE_VALUE}, - {"--admin_password=", 17, &mysqld_password, SAVE_VALUE}, + {"--mysqld-path=", 14, &mysqld_path, SAVE_VALUE}, + {"--admin-user=", 13, &mysqld_user, SAVE_VALUE}, + {"--admin-password=", 17, &mysqld_password, SAVE_VALUE}, {"--guarded", 9, &is_guarded, SAVE_WHOLE}, {NULL, 0, NULL, 0} }; |