diff options
| author | unknown <anozdrin@mysql.com> | 2006-06-20 18:28:28 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-06-20 18:28:28 +0400 |
| commit | 9f93f15b902e10ab1ca68c9ee05d86f8db58cd44 (patch) | |
| tree | 2ec04ccb6218dd72ab8207d0d2269d1db34b35af /mysql-test/r/im_utils.result | |
| parent | 40587958c1efb50db0ae963349b0705ee37c019c (diff) | |
| parent | cca7d7e678dd85a0e308ea640a350d2af8bd98b8 (diff) | |
| download | mariadb-git-9f93f15b902e10ab1ca68c9ee05d86f8db58cd44.tar.gz | |
Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
into mysql.com:/home/alik/MySQL/devel/5.1-merged
BitKeeper/deleted/.del-im_life_cycle-im.opt:
Delete: mysql-test/t/im_life_cycle-im.opt
BitKeeper/deleted/.del-im_utils-im.opt:
Delete: mysql-test/t/im_utils-im.opt
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/im_daemon_life_cycle-im.opt:
Auto merged
mysql-test/t/trigger.test:
Auto merged
server-tools/instance-manager/instance_map.cc:
Auto merged
mysql-test/r/im_life_cycle.result:
Manually merged.
mysql-test/r/insert.result:
Manually merged.
mysql-test/t/im_daemon_life_cycle.imtest:
Manually merged.
mysql-test/t/im_life_cycle.imtest:
Manually merged.
mysql-test/t/im_utils.imtest:
Manually merged.
mysql-test/t/insert.test:
Manually merged.
server-tools/instance-manager/guardian.cc:
Manually merged.
server-tools/instance-manager/manager.cc:
Manually merged.
sql/sql_insert.cc:
Manually merged.
Diffstat (limited to 'mysql-test/r/im_utils.result')
| -rw-r--r-- | mysql-test/r/im_utils.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index ae8e03bf8ea..df20a7fb5c7 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -1,3 +1,4 @@ +Success: the process has been started. SHOW INSTANCES; instance_name state mysqld1 online @@ -42,7 +43,9 @@ skip-ndbcluster VALUE nonguarded VALUE log-output VALUE START INSTANCE mysqld2; +Success: the process has been started. STOP INSTANCE mysqld2; +Success: the process has been stopped. SHOW mysqld1 LOG FILES; Logfile Path File size ERROR LOG PATH FILE_SIZE |