database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup

Browse Source
This commit is contained in:
unknown
2004-12-29 00:13:32 +03:00
parent 7ce58befd3
commit b859c1921e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server-tools/instance-manager/commands.cc
View File

@ -266,7 +266,7 @@ int Show_instance_options::do_command(struct st_net *net,
if (instance->options.mysqld_path != NULL) if (instance->options.mysqld_path != NULL)
{ {
position= 0; 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, store_to_string(&send_buff,
(char *) instance->options.mysqld_path, (char *) instance->options.mysqld_path,
&position); &position);
@ -286,7 +286,7 @@ int Show_instance_options::do_command(struct st_net *net,
if (instance->options.mysqld_user != NULL) if (instance->options.mysqld_user != NULL)
{ {
position= 0; 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, store_to_string(&send_buff,
(char *) instance->options.mysqld_user, (char *) instance->options.mysqld_user,
&position); &position);
@ -297,7 +297,7 @@ int Show_instance_options::do_command(struct st_net *net,
if (instance->options.mysqld_password != NULL) if (instance->options.mysqld_password != NULL)
{ {
position= 0; 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, store_to_string(&send_buff,
(char *) instance->options.mysqld_password, (char *) instance->options.mysqld_password,
&position); &position);
@ -408,7 +408,6 @@ int Stop_instance::execute(struct st_net *net, ulong connection_id)
stop_guard(instance); stop_guard(instance);
if ((err_code= instance->stop())) if ((err_code= instance->stop()))
return err_code; return err_code;
printf("instance was stopped\n");
net_send_ok(net, connection_id); net_send_ok(net, connection_id);
return 0; return 0;
} }

6
server-tools/instance-manager/instance_options.cc
View File

@ -101,9 +101,9 @@ int Instance_options::add_option(const char* option)
{"--datadir=", 10, &mysqld_datadir, SAVE_WHOLE_AND_ADD}, {"--datadir=", 10, &mysqld_datadir, SAVE_WHOLE_AND_ADD},
{"--bind-address=", 15, &mysqld_bind_address, SAVE_WHOLE_AND_ADD}, {"--bind-address=", 15, &mysqld_bind_address, SAVE_WHOLE_AND_ADD},
{"--pid-file=", 11, &mysqld_pid_file, SAVE_WHOLE_AND_ADD}, {"--pid-file=", 11, &mysqld_pid_file, SAVE_WHOLE_AND_ADD},
{"--mysqld_path=", 14, &mysqld_path, SAVE_VALUE}, {"--mysqld-path=", 14, &mysqld_path, SAVE_VALUE},
{"--admin_user=", 13, &mysqld_user, SAVE_VALUE}, {"--admin-user=", 13, &mysqld_user, SAVE_VALUE},
{"--admin_password=", 17, &mysqld_password, SAVE_VALUE}, {"--admin-password=", 17, &mysqld_password, SAVE_VALUE},
{"--guarded", 9, &is_guarded, SAVE_WHOLE}, {"--guarded", 9, &is_guarded, SAVE_WHOLE},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };