diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
| commit | 871378bc697c59f87b99c64d243136948b1f9d6f (patch) | |
| tree | 42fb1db881900588ca6d4b0cce2a7d825736863a /mysql-test/r/im_utils.result | |
| parent | e5bd94b2d4fd6937a0f5ff53a295fe14a83ccaef (diff) | |
| parent | 024a1781a6310383c1e352d483e7a701d564d051 (diff) | |
| download | mariadb-git-871378bc697c59f87b99c64d243136948b1f9d6f.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0
into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/rename.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/im_utils.result')
| -rw-r--r-- | mysql-test/r/im_utils.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index f671089d31d..626f24b4635 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -22,8 +22,8 @@ basedir VALUE server_id VALUE skip-stack-trace VALUE skip-innodb VALUE -skip-bdb VALUE skip-ndbcluster VALUE +skip-bdb VALUE SHOW INSTANCE OPTIONS mysqld2; option_name value instance_name VALUE @@ -42,8 +42,8 @@ basedir VALUE server_id VALUE skip-stack-trace VALUE skip-innodb VALUE -skip-bdb VALUE skip-ndbcluster VALUE +skip-bdb VALUE START INSTANCE mysqld2; Success: the process has been started. STOP INSTANCE mysqld2; |