diff options
author | unknown <jimw@rama.(none)> | 2006-07-12 12:30:22 -0700 |
---|---|---|
committer | unknown <jimw@rama.(none)> | 2006-07-12 12:30:22 -0700 |
commit | 812c9cc84acdde17da62a804c720f465ff72c292 (patch) | |
tree | 3a6a3ca3bba5cb4bfbd49895d54314e32ea337c4 /mysql-test/r/im_life_cycle.result | |
parent | 67d53e36cdbcc4cdf5dc785a5f465c1e1bc7fdbe (diff) | |
download | mariadb-git-812c9cc84acdde17da62a804c720f465ff72c292.tar.gz |
Bug #12673: Instance Manager: allows to stop the instance many times
The instance manager was not actually checking whether an instance
was actually running before trying to stop it. Now it checks first.
mysql-test/r/im_life_cycle.result:
Add new results
mysql-test/t/im_life_cycle.imtest:
Add new regression test
server-tools/instance-manager/instance.cc:
Fix Instance::stop() to report ER_INSTANCE_IS_NOT_STARTED when that is
the case. Also removed unnecessary goto.
server-tools/instance-manager/messages.cc:
Fix messages with missing spaces
Diffstat (limited to 'mysql-test/r/im_life_cycle.result')
-rw-r--r-- | mysql-test/r/im_life_cycle.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result index a9f78aea7d3..211a82eb9cf 100644 --- a/mysql-test/r/im_life_cycle.result +++ b/mysql-test/r/im_life_cycle.result @@ -74,3 +74,6 @@ START INSTANCE mysqld1,mysqld2,mysqld3; ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use STOP INSTANCE mysqld1,mysqld2,mysqld3; ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use +STOP INSTANCE mysqld2; +ERROR HY000: Cannot stop instance. Perhaps the instance is not started, or was started manually, so IM cannot find the pidfile. +End of 5.0 tests |