mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 22:25:32 +02:00
fix autobuild failures
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:
parent
57867f07b4
commit
596876f920
6 changed files with 18 additions and 15 deletions
|
|
@ -203,9 +203,12 @@ int Instance_map::cleanup()
|
|||
while (i < hash.records)
|
||||
{
|
||||
instance= (Instance *) hash_element(&hash, i);
|
||||
instance->cleanup();
|
||||
if (instance->cleanup())
|
||||
return 1;
|
||||
i++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -250,7 +253,7 @@ Instance *Instance_map::Iterator::next()
|
|||
{
|
||||
if (current_instance < instance_map->hash.records)
|
||||
return (Instance *) hash_element(&instance_map->hash, current_instance++);
|
||||
else
|
||||
return NULL;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue