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 | 14ffc9ba0def2ad33d2b57f09046b9fbbd3ccb3e (patch) | |
| tree | 5034889db20097c2dedd38c09e10a02cd93e2375 /mysql-test/r | |
| parent | b7853de7c36b350314d9dc6e19e312fa8d1f2382 (diff) | |
| download | mariadb-git-14ffc9ba0def2ad33d2b57f09046b9fbbd3ccb3e.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 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/im_options.result | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mysql-test/r/im_options.result b/mysql-test/r/im_options.result index f35f226f665..3225db0c8c5 100644 --- a/mysql-test/r/im_options.result +++ b/mysql-test/r/im_options.result @@ -1,13 +1,9 @@ --------------------------------------------------------------------- -server_id = 1 -server_id = 2 --------------------------------------------------------------------- SHOW VARIABLES LIKE 'server_id'; Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 starting +mysqld1 XXXXX mysqld2 offline UNSET mysqld1.server_id; ERROR HY000: The instance is active. Stop the instance first @@ -86,7 +82,7 @@ UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd; -------------------------------------------------------------------- -------------------------------------------------------------------- SET mysqld2.aaa, mysqld3.bbb, mysqld.ccc = 0010; -ERROR HY000: Bad instance name. Check that the instance with such a name exists +ERROR HY000: Unknown instance name -------------------------------------------------------------------- -------------------------------------------------------------------- -------------------------------------------------------------------- @@ -98,7 +94,7 @@ ERROR HY000: The instance is active. Stop the instance first -------------------------------------------------------------------- -------------------------------------------------------------------- UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc; -ERROR HY000: Bad instance name. Check that the instance with such a name exists +ERROR HY000: Unknown instance name -------------------------------------------------------------------- server_id = 1 server_id=2 |