database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

fix autobuild failures

Browse Source 
server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)
This commit is contained in:
unknown
2004-12-12 20:59:15 +03:00
parent 57867f07b4
commit 596876f920
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ int Show_instances::do_command(struct st_net *net)
Instance_map::Iterator iterator(instance_map);
instance_map->lock();
while (instance= iterator.next())
while ((instance= iterator.next()))
{
position= 0;
store_to_string(&send_buff, instance->options.instance_name, &position);
@@ -117,7 +117,7 @@ Show_instance_status::Show_instance_status(Instance_map *instance_map_arg,
Instance *instance;
/* we make a search here, since we don't want t store the name */
if (instance= instance_map->find(name, len))
if ((instance= instance_map->find(name, len)))
{
instance_name= instance->options.instance_name;
}
@@ -222,7 +222,7 @@ Show_instance_options::Show_instance_options(Instance_map *instance_map_arg,
Instance *instance;
/* we make a search here, since we don't want t store the name */
if (instance= instance_map->find(name, len))
if ((instance= instance_map->find(name, len)))
{
instance_name= instance->options.instance_name;
}
@@ -306,7 +306,7 @@ int Show_instance_options::do_command(struct st_net *net,
}
/* loop through the options stored in DYNAMIC_ARRAY */
for (int i= 0; i < instance->options.options_array.elements; i++)
for (uint i= 0; i < instance->options.options_array.elements; i++)
{
char *tmp_option, *option_value;
get_dynamic(&(instance->options.options_array), (gptr) &tmp_option, i);
@@ -355,7 +355,7 @@ Start_instance::Start_instance(Instance_map *instance_map_arg,
:Command(instance_map_arg)
{
/* we make a search here, since we don't want t store the name */
if (instance= instance_map->find(name, len))
if ((instance= instance_map->find(name, len)))
instance_name= instance->options.instance_name;
}
@@ -388,7 +388,7 @@ Stop_instance::Stop_instance(Instance_map *instance_map_arg,
:Command(instance_map_arg)
{
/* we make a search here, since we don't want t store the name */
if (instance= instance_map->find(name, len))
if ((instance= instance_map->find(name, len)))
instance_name= instance->options.instance_name;
}
@@ -406,7 +406,7 @@ int Stop_instance::execute(struct st_net *net, ulong connection_id)
if (instance->options.is_guarded != NULL)
instance_map->guardian->
stop_guard(instance);
if (err_code= instance->stop())
if ((err_code= instance->stop()))
return err_code;
printf("instance was stopped\n");
net_send_ok(net, connection_id);