1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

more fixes for IM to substitude mysqld_safe in startup scripts

This commit is contained in:
petr@mysql.com
2005-01-31 23:54:08 +03:00
parent 7ddedf1ee5
commit 84d5b3a332
14 changed files with 160 additions and 369 deletions

View File

@ -274,10 +274,10 @@ int Show_instance_options::do_command(struct st_net *net,
goto err;
}
if (instance->options.is_guarded != NULL)
if (instance->options.nonguarded == NULL)
{
position= 0;
store_to_string(&send_buff, (char *) "guarded", &position);
store_to_string(&send_buff, (char *) "nonguarded", &position);
store_to_string(&send_buff, "", &position);
if (my_net_write(net, send_buff.buffer, (uint) position))
goto err;
@ -350,7 +350,7 @@ int Start_instance::execute(struct st_net *net, ulong connection_id)
if (err_code= instance->start())
return err_code;
if (instance->options.is_guarded != NULL)
if (instance->options.nonguarded == NULL)
instance_map->guardian->guard(instance);
net_send_ok(net, connection_id);
@ -381,7 +381,7 @@ int Stop_instance::execute(struct st_net *net, ulong connection_id)
}
else
{
if (instance->options.is_guarded != NULL)
if (instance->options.nonguarded == NULL)
instance_map->guardian->
stop_guard(instance);
if ((err_code= instance->stop()))