database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups

Browse Source
This commit is contained in:
petr@mysql.com
2005-01-25 13:54:56 +03:00
parent d4e9719aff
commit ee08b749dd
14 changed files with 380 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ int Show_instance_status::do_command(struct st_net *net,
if (instance->is_running())
{
store_to_string(&send_buff, (char *) "online", &position);
store_to_string(&send_buff, mysql_get_server_info(&(instance->mysql)), &position);
store_to_string(&send_buff, "unknown", &position);
}
else
{
@ -283,28 +283,6 @@ int Show_instance_options::do_command(struct st_net *net,
goto err;
}
if (instance->options.mysqld_user != NULL)
{
position= 0;
store_to_string(&send_buff, (char *) "admin-user", &position);
store_to_string(&send_buff,
(char *) instance->options.mysqld_user,
&position);
if (my_net_write(net, send_buff.buffer, (uint) position))
goto err;
}
if (instance->options.mysqld_password != NULL)
{
position= 0;
store_to_string(&send_buff, (char *) "admin-password", &position);
store_to_string(&send_buff,
(char *) instance->options.mysqld_password,
&position);
if (my_net_write(net, send_buff.buffer, (uint) position))
goto err;
}
/* loop through the options stored in DYNAMIC_ARRAY */
for (uint i= 0; i < instance->options.options_array.elements; i++)
{