diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 17:03:44 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 17:03:44 -0700 |
| commit | eedbe37a704b6fe11f9329fed71c550e5861f0ed (patch) | |
| tree | 9bfa927345a25340450ca70ba9eb52f601842a43 /mysql-test/r/symlink.result | |
| parent | 33ab28e9ad4e663f4c801064ca80648cdd6e79c9 (diff) | |
| parent | 3a5064205f12528b67b98ebc153bde43de6b6583 (diff) | |
| download | mariadb-git-eedbe37a704b6fe11f9329fed71c550e5861f0ed.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/50
into siva.hindu.god:/usr/home/tim/m/bk/51
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
mysql-test/r/myisam.result:
Manual merge
mysql-test/t/myisam.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 b81f669f081..1d68a133b22 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 |