diff options
| author | unknown <anozdrin/alik@alik.opbmk> | 2007-02-23 23:36:25 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.opbmk> | 2007-02-23 23:36:25 +0300 |
| commit | 4acc8e9d2b09523636c503c952acba5f4c0f897c (patch) | |
| tree | 863c0e45ae28c013f7fb94c0d648e1b313303bbc /mysql-test/r/im_utils.result | |
| parent | 4f4de12237bc555527a0666f272934a8e6d0047b (diff) | |
| download | mariadb-git-4acc8e9d2b09523636c503c952acba5f4c0f897c.tar.gz | |
Fix merge & update result file.
mysql-test/mysql-test-run.pl:
Fix merge.
mysql-test/r/im_utils.result:
Updated result file.
Diffstat (limited to 'mysql-test/r/im_utils.result')
| -rw-r--r-- | mysql-test/r/im_utils.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index b7c68965ada..397050635e1 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -19,6 +19,7 @@ language VALUE character-sets-dir VALUE basedir VALUE server_id VALUE +shutdown-delay VALUE skip-stack-trace VALUE skip-innodb VALUE skip-ndbcluster VALUE @@ -37,6 +38,7 @@ language VALUE character-sets-dir VALUE basedir VALUE server_id VALUE +shutdown-delay VALUE skip-stack-trace VALUE skip-innodb VALUE skip-ndbcluster VALUE |