summaryrefslogtreecommitdiff
path: root/mysql-test/r/im_life_cycle.result
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2006-02-18 18:00:22 +0300
committerunknown <petr@mysql.com>2006-02-18 18:00:22 +0300
commitff94b12491cb6b71e840a6a91769d35617dcc1c3 (patch)
tree5f23def125a751c30d48e207333553ffaf6db9a8 /mysql-test/r/im_life_cycle.result
parent9dadc39fb5d718381c70aaca0721be8c76a45160 (diff)
parent187aab97b6936ed88b5021de0bc0ae342ac991c8 (diff)
downloadmariadb-git-ff94b12491cb6b71e840a6a91769d35617dcc1c3.tar.gz
Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug mysql-test/r/im_life_cycle.result: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged
Diffstat (limited to 'mysql-test/r/im_life_cycle.result')
-rw-r--r--mysql-test/r/im_life_cycle.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index 70aef9c40d5..e208ccb9f00 100644
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -64,3 +64,7 @@ mysqld1 online
mysqld2 offline
SHOW INSTANCE STATUS;
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
+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