Commit 1ebdbf6f authored by unknown's avatar unknown
Browse files

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
parents eedbe37a 588a8e0b

mysql-test/r/symlink.result

+1 −0
Original line number Diff line number Diff line
@@ -133,3 +133,4 @@ a 
42

drop table t1;

End of 4.1 tests

End of 5.0 tests