diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 16:51:12 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 16:51:12 -0700 |
| commit | 3a5064205f12528b67b98ebc153bde43de6b6583 (patch) | |
| tree | 10b32a7bdd80103a62aca53e2e55f8431f9dc742 /mysql-test/r/symlink.result | |
| parent | 46e1b71f68031ba249c375bbc71ae0355af71acd (diff) | |
| parent | a6f4c958cae1f75db34f371a4939d94d67348e98 (diff) | |
| download | mariadb-git-3a5064205f12528b67b98ebc153bde43de6b6583.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/41
into siva.hindu.god:/usr/home/tim/m/bk/50
mysql-test/r/myisam.result:
Manual merge.
mysql-test/r/symlink.result:
Manual merge.
mysql-test/t/myisam.test:
Manual merge.
mysql-test/t/symlink.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/symlink.result')
| -rw-r--r-- | mysql-test/r/symlink.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index c64d34aa80c..a85f14782ef 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -132,3 +132,4 @@ select * from t1; a 42 drop table t1; +End of 4.1 tests |