diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
| commit | 6017f911e33c3a44e6b7b090215446300c38b7be (patch) | |
| tree | 2e0b33c7cd3f1083dce485137fd952b52a37dfbd /mysql-test/r/im_life_cycle.result | |
| parent | 6e5d9284ed35fbf8dbe1af01e45923c3109aa7ad (diff) | |
| parent | 3c8150b79bf5302879897e0d1ebd594798bb419e (diff) | |
| download | mariadb-git-6017f911e33c3a44e6b7b090215446300c38b7be.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
client/mysql.cc:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'mysql-test/r/im_life_cycle.result')
| -rw-r--r-- | mysql-test/r/im_life_cycle.result | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result index 211a82eb9cf..53737b64f28 100644 --- a/mysql-test/r/im_life_cycle.result +++ b/mysql-test/r/im_life_cycle.result @@ -1,8 +1,7 @@ - --------------------------------------------------------------------- --- 1.1.1. --------------------------------------------------------------------- Success: the process has been started. +SHOW VARIABLES LIKE 'server_id'; +Variable_name Value +server_id 1 SHOW INSTANCES; instance_name status mysqld1 online @@ -40,10 +39,6 @@ ERROR HY000: Bad instance name. Check that the instance with such a name exists -------------------------------------------------------------------- -- 1.1.6. -------------------------------------------------------------------- -SHOW INSTANCES; -instance_name status -mysqld1 online -mysqld2 offline Killing the process... Sleeping... Success: the process was restarted. |