diff options
| author | acurtis/antony@ltamd64.xiphis.org <> | 2007-05-04 23:35:14 -0700 |
|---|---|---|
| committer | acurtis/antony@ltamd64.xiphis.org <> | 2007-05-04 23:35:14 -0700 |
| commit | a4dbc0990cc2f89a1b7f256f6d1d838f25f070c4 (patch) | |
| tree | 56b4a36694de3fd3fdb494ae00d38cd3f38d7c3d /mysql-test/r/im_utils.result | |
| parent | 5558019733b64303837c6428a215d69f21bdf971 (diff) | |
| parent | 0f0ef2fe14dd3082808b767abb6a995f255183c5 (diff) | |
| download | mariadb-git-a4dbc0990cc2f89a1b7f256f6d1d838f25f070c4.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
Diffstat (limited to 'mysql-test/r/im_utils.result')
| -rw-r--r-- | mysql-test/r/im_utils.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index 397050635e1..586a5ab6a8d 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -21,8 +21,8 @@ basedir VALUE server_id VALUE shutdown-delay VALUE skip-stack-trace VALUE -skip-innodb VALUE -skip-ndbcluster VALUE +loose-skip-innodb VALUE +loose-skip-ndbcluster VALUE log-output VALUE SHOW INSTANCE OPTIONS mysqld2; option_name value @@ -40,8 +40,8 @@ basedir VALUE server_id VALUE shutdown-delay VALUE skip-stack-trace VALUE -skip-innodb VALUE -skip-ndbcluster VALUE +loose-skip-innodb VALUE +loose-skip-ndbcluster VALUE nonguarded VALUE log-output VALUE START INSTANCE mysqld2; |