diff options
| author | unknown <anozdrin/alik@alik.opbmk> | 2007-02-18 15:45:28 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.opbmk> | 2007-02-18 15:45:28 +0300 |
| commit | f2f1e4d8526fc2a04a5ed37b9a251912c1a091cb (patch) | |
| tree | 5034889db20097c2dedd38c09e10a02cd93e2375 /server-tools/instance-manager/Makefile.am | |
| parent | 64a60185944131d985c224d3e4d3a879c1ca3296 (diff) | |
| download | mariadb-git-f2f1e4d8526fc2a04a5ed37b9a251912c1a091cb.tar.gz | |
Patch for IM in scope of working on BUG#24415: Instance manager test
im_daemon_life_cycle fails randomly.
1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.
mysql-test/r/im_options.result:
Updated result file.
mysql-test/t/im_cmd_line.imtest:
Updated test.
server-tools/instance-manager/IMService.cpp:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/IMService.h:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/Makefile.am:
Added angel.cc and angel.h.
server-tools/instance-manager/WindowsService.cpp:
Initialize class-members in constructor.
server-tools/instance-manager/WindowsService.h:
Initialize class-members in constructor.
server-tools/instance-manager/commands.cc:
Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE)
from FLUSH INSTANCES.
server-tools/instance-manager/manager.cc:
1. Return actual error code from Manager::flush_instances().
2. Be more verbose.
server-tools/instance-manager/manager.h:
Return actual error code from Manager::flush_instances().
server-tools/instance-manager/mysqlmanager.cc:
Move IM-angel functionality into separate file (angel.cc).
server-tools/instance-manager/priv.cc:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/priv.h:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/angel.cc:
IM-angel functionality.
server-tools/instance-manager/angel.h:
IM-angel functionality.
Diffstat (limited to 'server-tools/instance-manager/Makefile.am')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 6a974bc992d..19c4ac8de19 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -80,7 +80,9 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ portability.h \ exit_codes.h \ user_management_commands.h \ - user_management_commands.cc + user_management_commands.cc \ + angel.h \ + angel.cc mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ liboptions.la \ |