diff options
| author | unknown <petr@mysql.com> | 2006-02-10 21:03:49 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2006-02-10 21:03:49 +0300 |
| commit | b6cb3541c47be21d5b4a3f9c274ee77982a93a5f (patch) | |
| tree | 4d13c2225f6d16194332e4013c8e5e6a67ec4e21 /mysql-test/r/im_life_cycle.result | |
| parent | bcd7684df10650800bb57c27da5e215fbc143123 (diff) | |
| parent | 7f7cb76dcf70a9606b58fca36bebea28e09ac617 (diff) | |
| download | mariadb-git-b6cb3541c47be21d5b4a3f9c274ee77982a93a5f.tar.gz | |
Merge mysql.com:/home/cps/mysql/devel/5.0-mike
into mysql.com:/home/cps/mysql/devel/5.1-merge
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
server-tools/instance-manager/commands.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/im_life_cycle.result')
| -rw-r--r-- | mysql-test/r/im_life_cycle.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result index ca9ad7ce31c..70aef9c40d5 100644 --- a/mysql-test/r/im_life_cycle.result +++ b/mysql-test/r/im_life_cycle.result @@ -62,3 +62,5 @@ SHOW INSTANCES; instance_name status 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 |